Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Sat, 14 May 2011 21:31:21 +0000 (17:31 -0400)
committerMike Rylander <mrylander@gmail.com>
Sat, 14 May 2011 21:31:21 +0000 (17:31 -0400)
commit78bf023beae5c73197cff39c12ead1a15c84f256
tree03d5bd59b4c87263b74051ab2d78d3b5ecc2dd2d
parent0d655a4a76ebef7671ce56cb65238363b78ba66e
parent7cb08207f963d8c26adb4e8fa86a82d8442b6fbe
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement