Merge branch 'bug-1058' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:36 +0000 (21:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:36 +0000 (21:52 +0200)
commitf2bae896ea51449e491c4589c1a7702e8b8395d3
treeff005e6a63d06b06cc724c57f2c3a067bfe6baa8
parente3bf0049afe291472274900e438048ec809b13c4
parent519f297a18c6645c9a015b366d4b2ca9478fac41
Merge branch 'bug-1058' into bug-1042