Merge pull request #2319 from stieben/develop

author fabrixxm <fabrix.xm@gmail.com>

Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)

committer fabrixxm <fabrix.xm@gmail.com>

Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)
author fabrixxm <fabrix.xm@gmail.com>
Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)
committer fabrixxm <fabrix.xm@gmail.com>
Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)
diff --cc mod/network.php
Simple merge
diff --cc mod/ping.php
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)
committer	fabrixxm <fabrix.xm@gmail.com>
	Sun, 7 Feb 2016 08:52:20 +0000 (09:52 +0100)
		1	2
mod/network.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/ping.php	patch \|	diff1 \|	diff2 \|	blob \| history