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
..
lib/jquery/plugins	Bug 8523: Display auth hierarchies w/all marcflavours	2012-09-21 14:52:08 +02:00
prog	Merge branch 'bug_2832' into 3.12-master	2012-11-23 11:41:48 -05:00