Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 22:59:43 +0000 (18:59 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 22:59:43 +0000 (18:59 -0400)
commit960f69d43b34b5cd47237439e431022c07e26fc9
tree9d41ebff4f03c5b35269cd796514cb562479e6db
parent4c7f60339735df121d264d8270c934fc653a85ca
parentf762b75ac430ed70365ebc0385d2c9d0da04ab26
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/999.functions.global.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