Merge remote-tracking branch 'working/collab/gmcharlt/lp1638299_authority_indexing_in...
authorEquinox Support <esi@headings-test.equinoxinitiative.org>
Mon, 12 Jun 2017 21:03:08 +0000 (21:03 +0000)
committerEquinox Support <esi@headings-test.equinoxinitiative.org>
Mon, 12 Jun 2017 21:03:08 +0000 (21:03 +0000)
commit3ee23491c23439df61bfdba8507ef03f90446180
tree1755e4bbf83fb911cc6b82eff75741d61454da18
parentc1ecb3515503eef49debfe6e30e5df2548cb254a
parent2fb9b57a8d4c8b365f5fc305e4df6cc416ad402f
Merge remote-tracking branch 'working/collab/gmcharlt/lp1638299_authority_indexing_infrastructure' into authority_continued

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/templates/staff/admin/server/t_splash.tt2
Open-ILS/tests/datasets/sql/load_all.sql