From eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sun, 23 Aug 2015 09:48:37 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/lib/module.conf.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 0c4671e..124656b 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -42,7 +42,7 @@
 	'link' => 'admin/server_ip_list.php',
 	'html_id'   => 'server_ip_list');
 
-$items[] = array(   'title'  => 'Server IP mapping',
+$items[] = array(   'title'  => 'Server IPv4 mapping',
 	'target'  => 'content',
 	'link' => 'admin/server_ip_map_list.php',
 	'html_id'   => 'server_ip_map_list');

--
Gitblit v1.9.1