From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 5 Jul 2011 19:05:52 +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=818789a892fd603d7ef5c086ffc9d7103fecdfca;p=evergreen%2Fequinox.git

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

818789a892fd603d7ef5c086ffc9d7103fecdfca