Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 20:23:26 +0000 (16:23 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 20:23:26 +0000 (16:23 -0400)
commit7162be6d9d902068b2a86fa4b58a3ebbbfa7bb3b
tree7480726d4d0cc557e3ad74a8288d9760fc0ba77d
parentcd9d07d11f61bd174f797fdf5d0018631e50e214
parentbbc874ddb42ac05130ccfad92fc55ccebd6af882
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement