Björn Schießle 8067a1394e fix merge conflicts		2013-01-28 11:18:04 +01:00
..
config.sample.php	fix merge conflicts	2013-01-28 11:18:04 +01:00