Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Mon, 14 Jul 2014 14:14:41 +0000 (10:14 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 14 Jul 2014 14:14:41 +0000 (10:14 -0400)
commita73b4460df3b9769e9d4ccf632c641a92eb63b84
treeb267a381a20a0cd32f7857c88fdbf021f89c4cac
parentf152fcf8f0d7b72cb33fc2d6f9cd4e743b3ff479
parenteed53164c530fa380ac313dec24ca84a25a6699d
Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
.gitignore
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm