Georg Ehrke af983b843d fix merge conflicts		2013-08-05 14:27:38 +02:00
..
config.sample.php	fix merge conflicts	2013-08-05 14:27:38 +02:00