From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 15 May 2011 17:42:05 +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=ac617a68b454b80537baaa493d51e4f7c2946d1d;p=evergreen%2Fequinox.git

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

ac617a68b454b80537baaa493d51e4f7c2946d1d