Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 19:01:43 +0000 (15:01 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 19:01:43 +0000 (15:01 -0400)
commit6675dbfd1565af00477484e6c14cdead1357ee17
treeefa14fe7c579952b549cb27297c8a286a4388fb5
parenta606ebc63080b51b9d04eb026cd2925e9f8594cc
parent41510e82a8946a13965c7db5ed10b0491d88f603
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets