From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 15 Jun 2011 13:28:06 +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=65c05e4f936c3bdda404fa81d54db1e684352d52;p=evergreen%2Fequinox.git

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

65c05e4f936c3bdda404fa81d54db1e684352d52