Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 00:41:33 +0000 (20:41 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 00:41:33 +0000 (20:41 -0400)
commitd1323e036e9b9299e18209a67373bacb79fd2279
tree970a3a0edd5de47ec5483b5c4ee63a357179289c
parentcbce35cbcb4cc1ef31b0c4ead2cd795ed1dcd5f5
parent8a26888af4c658849d4089ace91c91ecc005985d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement