Merge branch 'bug-932'
authorBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 18:37:53 +0000 (20:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 18:37:53 +0000 (20:37 +0200)
commit7f20913d8b39bb701254d1e9e326578b1590721d
treec40de78eb1558cf542fe6c73adc6c575cf2c773e
parent4e5c9dd72b45ec7d59a13b28ac1c4ccd600cd95b
parent9987c02e3e9e8f1d9b6219c1384297036c583da7
Merge branch 'bug-932'