Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Sun, 6 Apr 2014 17:52:24 +0000 (13:52 -0400)
committerBill Erickson <berick@esilibrary.com>
Sun, 6 Apr 2014 17:52:24 +0000 (13:52 -0400)
commit9cbdcdbc6a50c1512ee01db2181fc649afdfdcde
tree1a26d2fd20f65269c35c3d25342470475769b596
parente847b1e6cdf91fb2be8a851f4ee7586aa8ae1450
parentf23274d750213f8d9332ee5edc443f70b432b1de
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto