From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 25 May 2011 14:11:56 +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=a3f748985f67b1897aef259897e92ac8aa0b2c6b;p=evergreen%2Fequinox.git

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

a3f748985f67b1897aef259897e92ac8aa0b2c6b