Merge branch 'bug-1389' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 26 Aug 2015 06:27:52 +0000 (08:27 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 26 Aug 2015 06:27:52 +0000 (08:27 +0200)
commit000b17a9a909737930d59dee82c40e7eab2fa337
tree6709958648fe30bd571b7e774703cd2120fb7503
parent86fd20719e199c2400427ad2198223f0f2bad49f
parenta0274662cf30a102b53a6d0ae63ccec01a6b19a1
Merge branch 'bug-1389' into release