Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 15:12:30 +0000 (11:12 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 15:12:30 +0000 (11:12 -0400)
commit778801c91259b5ddb2526aa1f49c7d22bbdb4a3b
treeff566694e0d17c25973cd4ba8bc0bf6926752ff9
parent2c6d7d2511e3fc131b6b27dbdbbe22fb14a9652b
parent8893e1cc615fd47d6e4fc976f0f5800a2d5fcbbb
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets