Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 14:11:56 +0000 (10:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 25 May 2011 14:11:56 +0000 (10:11 -0400)
commita3f748985f67b1897aef259897e92ac8aa0b2c6b
tree1731185ebe5242c15da00c2f26936501a16af33a
parent7ad5c52fa15e1d724c1140bf55460d6923f7ceea
parent8bb24e67e89c016dfc7d3d0c0c717da3e46fdbad
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets