Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 20:19:59 +0000 (16:19 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 20:19:59 +0000 (16:19 -0400)
commitf00ab02b1fc8e440a83e0edda394f6ae61861483
tree95248a04380c0169606292bcea3993ea9ec3d0fd
parent778801c91259b5ddb2526aa1f49c7d22bbdb4a3b
parentf40b83b780d9bfda75f34462977f3244840d20d8
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets