Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Tue, 26 Nov 2013 19:07:14 +0000 (14:07 -0500)
committerBill Erickson <berick@esilibrary.com>
Tue, 26 Nov 2013 19:07:14 +0000 (14:07 -0500)
commit4b2e0cd73359a8dbdbf87c779c26bdb55146feb6
treeaf11ae582e599588c7fc9550874a1cc53541c4c4
parente4c1f9745e7b82b168a4fcfb6b4f5268753dd035
parent61302b72d463d035985bc34f535606742678c758
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto