From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 20 Jun 2011 15:51:45 +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=d697916983adee9b66af8d98a21a34419d752bb6;p=evergreen%2Fequinox.git

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

d697916983adee9b66af8d98a21a34419d752bb6