From: Bill Erickson <berick@esilibrary.com>
Date: Fri, 18 May 2012 17:17:27 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into tpac-added-content
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a2cf45de8d2213eafcbefc9c7512f6bd885aa17f;p=evergreen%2Fequinox.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into tpac-added-content
---

a2cf45de8d2213eafcbefc9c7512f6bd885aa17f