Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59

 install/lib/installer_base.lib.php

@@ -854,10 +854,6 @@

   }
   
   public function configure_postgrey() {
		
   }

   public function configure_saslauthd() {
      global $conf;