From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 14 Jun 2011 22:12:04 +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=02966f67037f1db4d05d654ed7384b65b41c9f14;p=evergreen%2Fequinox.git

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

02966f67037f1db4d05d654ed7384b65b41c9f14