Chris Vigelius 19d94471d9 Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME ...

Conflicts (resolved):
	lng/english.lng.php
	lng/german.lng.php

2015-07-30 11:35:26 +02:00

..

class.HttpConfigBase.php

Merge branch 'master' into vhost_config_variables, and replace IS_SSL with SCHEME

2015-07-30 11:35:26 +02:00