Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
authorMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 22:58:44 +0000 (18:58 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 27 Jun 2011 22:58:44 +0000 (18:58 -0400)
commitc3893e9e4ffc192e68daa7cde94d77ce0d5e5c5d
tree75e8676d5e01fbc4a45f7403aa827278446a3d2c
parent24971817712a0a2704a95d43b9810ff38035e931
parentf762b75ac430ed70365ebc0385d2c9d0da04ab26
Merge branch 'master' of git.evergreen-ils.org:Evergreen into authority-control-sets
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