From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 16 May 2011 22:26:26 +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=2647445efe699e9a7d6267c7f80fe398c7018f09;p=evergreen%2Fequinox.git

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

2647445efe699e9a7d6267c7f80fe398c7018f09