From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 19 Jun 2011 01:38:41 +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=88033ee2b09a3544d7cb5ab283fa3bf83a936628;p=evergreen%2Fequinox.git

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

88033ee2b09a3544d7cb5ab283fa3bf83a936628