From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 1 Jun 2011 15:16:05 +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=1e5f9d768355ba28ce1d4d13bd08e918f9188684;p=evergreen%2Fequinox.git

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

1e5f9d768355ba28ce1d4d13bd08e918f9188684