Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 17:09:54 +0000 (13:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 17:09:54 +0000 (13:09 -0400)
commit317c2bceb039a0ac275093d9ffd8220089f587f7
tree2db773394f17573cae8b58d2926163d7a310c154
parente43ac70c27c0257379733635c1b60b642edad2ed
parent06bd754a9229eb8751ca63ed9e34bb4e7c77b22a
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets