Merge branch 'bug-597' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 13 Feb 2015 08:01:41 +0000 (09:01 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 13 Feb 2015 08:01:41 +0000 (09:01 +0100)
1  2 
CommModule/client.pl

Simple merge