From: evergreen <evergreen@squeeze.debian>
Date: Fri, 15 Jul 2011 23:49:55 +0000 (-0400)
Subject: Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d2f3229ab5d031b125d9f6dc5320806bbb4db914;p=contrib%2FConifer.git

Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
---

d2f3229ab5d031b125d9f6dc5320806bbb4db914