From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sun, 3 Apr 2011 10:35:24 +0000 (+1200)
Subject: Merge remote branch 'kc/master' into new/enh/bug_5917
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=eb4ad6e44e2d38b118fc42a350461a2fc4b26bad;p=koha.git

Merge remote branch 'kc/master' into new/enh/bug_5917
---

eb4ad6e44e2d38b118fc42a350461a2fc4b26bad
diff --cc installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 25f3f5878d,2773a7204f..526d25863e
mode 100644,100755..100755
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
diff --cc installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index f3bc969b75,f09ed54145..f6bb3ee7ef
mode 100644,100755..100755
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
diff --cc installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
index 3feec7fd6d,3cb5d8fd39..65821c0f5b
mode 100644,100755..100755
--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql