Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 18:20:27 +0000 (14:20 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 18:20:27 +0000 (14:20 -0400)
commitf5b5b1576770c2f976a8fc6243125a0e9297d3cf
treebfe69bcf3d486d10905784f552ab152d92182e97
parenta3f748985f67b1897aef259897e92ac8aa0b2c6b
parente62e2f75b0d6cb9100811f8db90abac93dcca118
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets