Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 00:41:10 +0000 (20:41 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 00:41:10 +0000 (20:41 -0400)
commitd9c166e1049face609403c40fe001d6cf5f326a4
tree2b205bf91c10c96e18a7442754012cd10dff165a
parentf5b5b1576770c2f976a8fc6243125a0e9297d3cf
parent8a26888af4c658849d4089ace91c91ecc005985d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets