Merge remote-tracking branch 'working/user/berick/web-staff-phase1-squash' into web... user/gmcharlt/tmp-web-staff
authorGalen Charlton <gmc@esilibrary.com>
Wed, 27 Aug 2014 15:33:51 +0000 (08:33 -0700)
committerGalen Charlton <gmc@esilibrary.com>
Wed, 27 Aug 2014 15:33:51 +0000 (08:33 -0700)
commitb79024903b321548c91b3d61877f33e6678f160b
treedebf1a37826071fb3775662e975496ee6780184f
parent1d1a431727a77322c5b6213d76b334e7729e7d1d
parent4087f23e61b43ef902d2759b12fd4f7f8110da00
Merge remote-tracking branch 'working/user/berick/web-staff-phase1-squash' into web-based-stasff
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm