Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:39 +0000 (14:45 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 18:45:39 +0000 (14:45 -0400)
commite716eb86b5f652672b076202c279ca7742b491c2
treecd34153751a62bf1436b6e3c68f99f6779b423af
parentf500b53e5bd03c606eb01d47423819d051d47875
parent81818c81a1df25ded485329195c9a40b960c05bd
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets