Merge branch 'bug-1302' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 22:06:09 +0000 (00:06 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 22:06:09 +0000 (00:06 +0200)
commitc5319deb225fbe2dc36c526063d7192690208c60
treecc6fbd029870522257f4925aa462639cec4ab981
parentc53755996f752bbf23c72c60446c52ee06c5c061
parent60b26b969e68c2928345713c52ddd622cee57aaa
Merge branch 'bug-1302' into testserver-stable