Georg Ehrke e29ae46609 fix merge conflicts		2012-04-21 22:12:31 +02:00
..
dialog.php	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00
import.php	fix merge conflicts	2012-04-21 22:12:31 +02:00