Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 19:46:49 +0000 (15:46 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 19:46:49 +0000 (15:46 -0400)
commit4dc12d8400b413d35e991345251b5525e5704848
tree5c800b11f1c96b0320ca1c22038b6555d697c301
parenta4cb1856d26be434781201f1bb33973d913771e4
parentf0b408bc6822b9b8be150c9af5947748edba06f2
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets