Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 22 Jun 2011 15:19:28 +0000 (11:19 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 22 Jun 2011 15:19:28 +0000 (11:19 -0400)
commit1c2408142740e590f8898187a2c8ad8b5fc2760c
treeddf68b1959989ffb20f0769b9e93eec8dfa109f0
parentf0f9c0d3ce6e92672cf7c14e1f1663e7327f0e63
parent9544ad05dc0d30ed5782b528fac3e2bdfa90e4dd
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets