Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
config.sample.php	merge conflicts ...	2013-07-10 12:41:53 +02:00