Merge branch 'bug-1360' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 16 Jan 2015 17:54:46 +0000 (18:54 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 16 Jan 2015 17:54:46 +0000 (18:54 +0100)
1  2 
CommModule/client.pl

Simple merge