Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:11:45 +0000 (13:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:11:45 +0000 (13:11 -0400)
commit2c588437980cacedc6bfa7657fc4efe95d82c23a
tree54867be869290ef848cfef8f2362d2e572ca02fd
parent3f8f6eddafd8bf4509cebc7100f81e9f0159f93d
parentac80f3b7c3e6e3104ad81ce8a424814155ee728d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets