Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge

diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/100.circ_matrix.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/110.hold_matrix.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge