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

Florian Schaal

2016-02-10 42e4c6e34d9ba18eebf16ef3b0c0af290c3d58d1

 interface/web/admin/form/server_ip_map.tform.php

@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

$form["title"]    = "IP Addresse mapping";
$form["description"]  = "";
$form["title"]    = "IPv4 Address mapping";
$form["description"]  = "Form to map IPv4-addresses for Web-Server";
$form["name"]    = "server_ip_map";
$form["action"]   = "server_ip_map_edit.php";
$form["db_table"]  = "server_ip_map";