Merge branch 'bug-1046' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:16 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:16 +0000 (23:50 +0200)
commit30ed0e2c2da2458608e08479c0b7533c93ff598a
treec1972c0b7205cd8dff99a39f0b2b719387b07a4a
parentb9d8afd498aa01de66c84845edadd22d43934a14
parent0c74160092fc85ed503f7cd93f231dd0e6d780fa
Merge branch 'bug-1046' into bug-1042