Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:54:58 +0000 (08:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 31 Jul 2015 06:54:58 +0000 (08:54 +0200)
commit39b237c1d4e035e6df6a7588261b6460eaf757ed
tree2c213c90556ed7a2bc9e22367b096149946b80d8
parentfc7a085b29e36dccd3e891f693693679b5cdc801
parentbbfbb594549557f794015112dd3845d6b4f704ba
Merge branch 'bug-1391'