Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 13:28:00 +0000 (09:28 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 13:28:00 +0000 (09:28 -0400)
commit278a0df4f7e3d84a8f8ba3d6650bb51d7e6d7431
tree6ad30e6f662998c6290c8813f7d4cf14bdf7cbc6
parent8ab46a4fbdb706fdb4f3b5a676eeb7ee30bb74ac
parentbf83c01e4f232e050ec320969b9bb6c6a8c1eeb1
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets