Jared Camins-Esakov e93cc44941 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>		2012-11-23 11:41:48 -05:00
..
data	Merge branch 'bug_2832' into 3.12-master	2012-11-23 11:41:48 -05:00
externalmodules.pl
html-template-to-template-toolkit.pl
install.pl	Bug 7857 - [SIGNED-OFF] database upgrade fails with plack	2012-06-20 21:33:34 +02:00
InstallAuth.pm