From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 26 May 2011 00:41:10 +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=d9c166e1049face609403c40fe001d6cf5f326a4;p=evergreen%2Fequinox.git

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

d9c166e1049face609403c40fe001d6cf5f326a4