Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Thu, 19 May 2011 13:51:55 +0000 (09:51 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 19 May 2011 13:51:55 +0000 (09:51 -0400)
commit7179b4887ce9278e1bfb7f954498871d837c88a4
treece454cd215aa8d0bb64c9e2eaed08fcbffa9550f
parent57dc5e23c6e80165001e565e663a2aa90db6a718
parent0b4b17a2f6713c29ac81cadc0fca53fe4dd959da
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets