merge master

Dominik

2014-03-20 0a95e95ddd9374ecee54e0e77e767e4decf6a8b4

 interface/lib/config.inc.php

@@ -44,7 +44,7 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4dev');
define('ISPC_APP_VERSION', '3.1dev');
define('DEVSYSTEM', 0);