Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 21:51:54 +0000 (17:51 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 15 May 2011 21:51:54 +0000 (17:51 -0400)
commit2c6d7d2511e3fc131b6b27dbdbbe22fb14a9652b
treea88ef3ac345f8b6dfa82917397b9e60689e819fa
parentac617a68b454b80537baaa493d51e4f7c2946d1d
parente72fba256f14e091a22c217b65537652e7a823df
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets