From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 3 Jun 2011 17:09:54 +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=317c2bceb039a0ac275093d9ffd8220089f587f7;p=evergreen%2Fequinox.git

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

317c2bceb039a0ac275093d9ffd8220089f587f7