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)
commitdcab312e776396123f9c4e2cca724fd681fcb42e
tree32a6065789dcaaf01886097eb2be117e57d207f2
parent3d69a10d61d29b33a14db2bc6861d4129d7cdfda
parent69cbc101efa4a568e92d98d97bfc1e0f41d68e41
Merge branch 'bug-1392' into testserver-stable
CommModule/server.pl
includes/general.php