Merge branch 'bug-932'
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:52:44 +0000 (22:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:52:44 +0000 (22:52 +0200)
commit4e5c9dd72b45ec7d59a13b28ac1c4ccd600cd95b
treec0727b82566b439ff9c32b8386e0eecfe4959463
parent8a5059809e66396eb97dbe1588cd28b8d38eb8a2
parent269829b175dac7bf3f2128fbd5c55ba08f48d2d0
Merge branch 'bug-932'