Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:01 +0000 (13:25 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:01 +0000 (13:25 -0400)
commit172f07ac26ff0e8e4337171b7883a22a7a2baad0
tree13d34bcc0fb80cf182ca4a9d84d28fcdb2631829
parentc32885b5c2094807c4ecc3fba51dd848966f210c
parentaa155d652e018084f5bc5369df86e46c3ea822a7
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets