From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 19 May 2011 16:59:09 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5280cfd3823ffcf4a95c4f8c3afc41c010ac9d70;p=evergreen%2Fequinox.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
---

5280cfd3823ffcf4a95c4f8c3afc41c010ac9d70