Merge branch 'bug-1304' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 10 Sep 2014 21:01:25 +0000 (23:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 10 Sep 2014 21:01:25 +0000 (23:01 +0200)
commitfd85f2309123a8853f09cdcb53567f6afe591d65
treeb0eaa183f5f59996458d6e055b16eb2f3b8f1ad3
parentc5319deb225fbe2dc36c526063d7192690208c60
parent66990b8dd7493f7a32d143ffa9caa8b86f2a7734
Merge branch 'bug-1304' into testserver-stable