Merge branch 'bug-1255' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Mar 2014 19:38:16 +0000 (20:38 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Mar 2014 19:38:16 +0000 (20:38 +0100)
commit43882c78ea9f65396889955876ae9e4a963e7fc2
tree94efde7c26326bee9ea009d5cc8b5a7fd33e294f
parent5476ac472c00936c1687541b4eb2b0a40f4eec79
parent2ea7e3224f3fe0e604622dca3faf533579beda84
Merge branch 'bug-1255' into release