Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Wed, 25 Jun 2014 19:01:22 +0000 (15:01 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 25 Jun 2014 19:01:22 +0000 (15:01 -0400)
commit6f4af491d93f64482e797d2f3f3a33f0cb75b44c
treea25c86c0a5da6c4dab947d7ed1e5a10fb8a80edf
parentad80b7a2aafe3876533370933d0bdf5918899a56
parent65307dea427c4e006da6035699ee2201e9065cb0
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto