From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 29 Jun 2011 19:13:19 +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=e44125cc766dbe2df5500a3d2502c146de741e37;p=evergreen%2Fequinox.git

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

e44125cc766dbe2df5500a3d2502c146de741e37