Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:40:41 +0000 (12:40 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:40:41 +0000 (12:40 -0400)
commita8e273e0d96fa03e20b422413d329f30fe04b291
tree473ed0236d843ea8221f9994fc75fce2d5d3fee7
parent278a0df4f7e3d84a8f8ba3d6650bb51d7e6d7431
parent4abc3d760e90fcfad5676e8564bca3375736198b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets