Merge branch 'master' into for-masslnc for-masslnc
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 9 Sep 2011 18:39:09 +0000 (14:39 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 9 Sep 2011 18:39:09 +0000 (14:39 -0400)
commit641b8064568b945c399dbeaea5d40fd1f18d8afe
tree5ba0c5144728ec8a13e966c6c126887b21167d55
parent1f0bcde107901a44632175adf3d2c2644b22167c
parent6d21b9431c8d73c88b8d41c874ff766c11f90746
Merge branch 'master' into for-masslnc
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