From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 28 Jun 2011 15:27:10 +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=d99c84dbc53c757a8921553bb2a7f5d97e856e19;p=evergreen%2Fequinox.git

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

d99c84dbc53c757a8921553bb2a7f5d97e856e19