Merge branch 'bug-1392' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:45:00 +0000 (14:45 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 25 Jul 2015 12:45:00 +0000 (14:45 +0200)
1  2 
CommModule/server.pl
includes/general.php

Simple merge
Simple merge