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

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

f5b5b1576770c2f976a8fc6243125a0e9297d3cf