From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 23 May 2011 16:29:45 +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=7ad5c52fa15e1d724c1140bf55460d6923f7ceea;p=evergreen%2Fequinox.git

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

7ad5c52fa15e1d724c1140bf55460d6923f7ceea