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

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

a0690704b2029480ceca89dc1ec0b6d16fee7fc3