Merge correction
authorMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:57:12 +0000 (09:57 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:57:12 +0000 (09:57 -0400)
commit149749c45d2019def99486d3ffb646299af81268
tree11f98c182335243d51536d788ddf3084f5f46295
parent100723078317805cf07f2c45566d2eb8a4698925
parent7d1040a86595c50dadb235c5c014ae7a5e9294f4
Merge correction

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/xul/staff_client/chrome/content/main/menu.js
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul