Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 5 Jul 2011 19:05:52 +0000 (15:05 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 5 Jul 2011 19:05:52 +0000 (15:05 -0400)
commit818789a892fd603d7ef5c086ffc9d7103fecdfca
treeeabc02e0ee152a1837b13ba5f149ac9a09aad667
parentbf6a3a8176b41e2bf093acbd8bd24deb96cfe4a2
parent0062008c0a346ee37a9ae8870e33c06823c67a49
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets