Merge branch 'bug_2832' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:41:48 +0000 (11:41 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:41:48 +0000 (11:41 -0500)
commite93cc449410f6c8d90b616f3d8e002e9ade4dadd
tree8800105bf12998e034f4576419260f2212050840
parent6a265eb793bd8b4bb91339b1beb05a317bcf1df8
parent5511dad7028439f38e8197e54610b96c03f7848f
Merge branch 'bug_2832' into 3.12-master

Conflicts:
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
installer/data/mysql/updatedatabase.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
installer/data/mysql/updatedatabase.pl