Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:27 +0000 (10:43 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 20 May 2011 14:43:27 +0000 (10:43 -0400)
commit7727969cc7c2b31c958b42ca24974851677dfb30
tree27038414277d638e4f483a004d4931d124172bc0
parent5280cfd3823ffcf4a95c4f8c3afc41c010ac9d70
parentea20f3920b2ef71e12ef40afdeb40a6f5f361186
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets