Merge branch 'bug-1058' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:25:31 +0000 (00:25 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:25:31 +0000 (00:25 +0200)
commit6c68caa8d2679675721f3e8ba2210f6ce8f491f1
tree8a4e598e249747afae34795aea0fb14b7be30b9f
parent8b7a12b799f5a323f7ce08fe6c9479c81e48565a
parentf2a909d694c7039d6a405e71674f325e2ddffc3e
Merge branch 'bug-1058' into bug-1042