From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 18 May 2011 19:35:35 +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=57dc5e23c6e80165001e565e663a2aa90db6a718;p=evergreen%2Fequinox.git

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

57dc5e23c6e80165001e565e663a2aa90db6a718