Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 19:35:35 +0000 (15:35 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 19:35:35 +0000 (15:35 -0400)
commit57dc5e23c6e80165001e565e663a2aa90db6a718
treede76fca6bdde589a63ac4d175419dc3a947ba5af
parenta8e273e0d96fa03e20b422413d329f30fe04b291
parent76791e23e15e00e1055ed0f2e72369db50407479
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets