From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 17 May 2011 19:01:43 +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=6675dbfd1565af00477484e6c14cdead1357ee17;p=evergreen%2Fequinox.git

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

6675dbfd1565af00477484e6c14cdead1357ee17