Sebastian Grewe ae9459eb92 Merge branch 'next' into issue-444-theserapher		2013-09-16 17:46:31 +02:00
..
admin_settings.inc.php
global.inc.dist.php