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

Florian Schaal

2015-12-20 dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6

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

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

$form["title"]    = "IPv4 Addresse mapping";
$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";