Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Wed, 4 Dec 2013 14:31:09 +0000 (09:31 -0500)
committerBill Erickson <berick@esilibrary.com>
Wed, 4 Dec 2013 14:31:09 +0000 (09:31 -0500)
commitf486cdbf5029ef891ebaa37b9c4c976118c19a67
tree28af399f328f555c9597ecaba96305a06b6141e3
parent1b18ed5acbcb126d9e627694777d3a55fe2612ef
parentcc78604b770fe82e76bf99f78abc8e28631c4c55
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto