Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
authorMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:11:07 +0000 (14:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:11:07 +0000 (14:11 -0400)
commitcde9928e68c3e4672414a0fa240ddee3469916b5
tree3f5efba60750c5b570d2696b5e31d9a8bca8c993
parentb4285726782d2f829f43d83ea932d5ee2d5feafe
parent007195f83beb33519d90133818a7d114ae82428b
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
Open-ILS/examples/fm_IDL.xml
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