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/perlmods/lib/OpenILS/Application/Search/Biblio.pm
Simple merge

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

diff --cc Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge

diff --cc Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
Simple merge

diff --cc Open-ILS/xul/staff_client/chrome/content/main/constants.js
Simple merge

diff --cc Open-ILS/xul/staff_client/server/cat/copy_editor.js
Simple merge