Merge remote-tracking branch 'working/user/tsbere/floating_groups' into 201303013
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:52:57 +0000 (09:52 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 13 Mar 2013 13:52:57 +0000 (09:52 -0400)
commit235dbc6f837de18b448300c0d850f6d7910f34db
treef86cc8654fa4e494a06312ac92de494507f35c96
parent2fda925264155d80842e8798a8848be8ec8f05c2
parent240be71b13a8d06d4702d00883783f319ecef14f
Merge remote-tracking branch 'working/user/tsbere/floating_groups' into 201303013

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/sql/Pg/800.fkeys.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
Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
Open-ILS/xul/staff_client/server/circ/util.js