Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Sat, 14 May 2011 21:31:08 +0000 (17:31 -0400)
committerMike Rylander <mrylander@gmail.com>
Sat, 14 May 2011 21:31:08 +0000 (17:31 -0400)
commit4739373824b98ab8b76c3fd4f619e544006fd345
treefed64075dca6ec5e833efa182cd513ee1881dd5c
parent79ba1856bda6ab470ce7483fe5bb0a7061c9cb7f
parent7cb08207f963d8c26adb4e8fa86a82d8442b6fbe
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets