Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2016-01-26 61a4a721c96103fbdc448f52fb0f9c2ccb33e665

 server/plugins-available/firewall_plugin.inc.php

@@ -38,7 +38,7 @@
   public function onInstall() {
      global $conf;

      if($conf['bastille']['installed'] = true && $conf['services']['firewall'] == true) {
      if($conf['bastille']['installed'] == true && $conf['services']['firewall'] == true) {
         return true;
      } else {
         return false;