Galen Charlton 8ad2c7d7ac Merge commit 'pianohacker-koha/prefs-submit' into master ... Merge in Jesse Weaver's system preference editor changes. Conflicts: C4/Bookfund.pm koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl Signed-off-by: Galen Charlton <gmcharlt@gmail.com>		2010-01-26 20:26:17 -05:00
..
prog	Merge commit 'pianohacker-koha/prefs-submit' into master	2010-01-26 20:26:17 -05:00