Merge branch 'bug-1059' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:26:58 +0000 (00:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:26:58 +0000 (00:26 +0200)
commitf0cdbfab3852d7bad78df54d4c474ca2f6b0f736
treef5e3764f58c064352894e9cc214fd7ed61b1a143
parent6c68caa8d2679675721f3e8ba2210f6ce8f491f1
parent17cd1e7fb941f8f0180b457d3791718e47cabf80
Merge branch 'bug-1059' into bug-1042