Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 00:11:03 +0000 (20:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 27 May 2011 00:11:03 +0000 (20:11 -0400)
commitf500b53e5bd03c606eb01d47423819d051d47875
tree8346c46466b80900d25b09786bab6054b82f5923
parent55b0296ccdc56359a03f72b426dfe7fe166c0fb3
parentbbc874ddb42ac05130ccfad92fc55ccebd6af882
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets