Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 15:28:07 +0000 (11:28 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 14 Jun 2011 15:28:07 +0000 (11:28 -0400)
commitd613dbe0048fad70a7be777aa66ec745e0717266
tree0d939694c98d920a3e8719bd362cc96b75a8b9f0
parentcbe8b0b5c927bc3c929bf680144f0e50568ed5e7
parentc1b1d40e661fdafd16863af098fda965807de22b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets