Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 14:56:27 +0000 (10:56 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 14:56:27 +0000 (10:56 -0400)
commit3f8f6eddafd8bf4509cebc7100f81e9f0159f93d
tree7aa2b1faf2993506192e4deed633123649365ed7
parentd9c166e1049face609403c40fe001d6cf5f326a4
parent623aeb0f51c9ae4bed3eaf9f34574132c8e73206
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets