Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:01 +0000 (15:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 19:09:01 +0000 (15:09 -0400)
commitcbe8b0b5c927bc3c929bf680144f0e50568ed5e7
tree9efda86665ea592aff5a94cfe71616267a58e39f
parent5214bd0840c4466ad0acf6eb9b175524ff327539
parenta66e257f791c550a00f3b927c2d34abf34a920e7
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets