Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 14:56:58 +0000 (10:56 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 14:56:58 +0000 (10:56 -0400)
commitfc5e7610f7251e6179294cec27c0c6613a40d95e
treeb81e0b379a5a6e1349ec154045197fa1854c82a1
parentd1323e036e9b9299e18209a67373bacb79fd2279
parent623aeb0f51c9ae4bed3eaf9f34574132c8e73206
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement