Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac...
authorBill Erickson <berick@esilibrary.com>
Thu, 8 Sep 2011 19:55:36 +0000 (15:55 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 8 Sep 2011 19:55:36 +0000 (15:55 -0400)
commite5ff20ac80dffbc7fd6f07d27bd6a1024dfa1c72
tree81fb7681e264b24083b66a15caa4c07f28f0312b
parent7ad01367e36c6b8dd0a07590c8708271641ec567
parent642dae8cbd68410b80f518ac1683e64003735738
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/Makefile.am
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/templates/booking/reservation.tt2
Open-ILS/src/templates/conify/global/acq/provider.tt2