Merge branch 'bug-1392' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:49:06 +0000 (23:49 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:49:06 +0000 (23:49 +0200)
commit86fd20719e199c2400427ad2198223f0f2bad49f
treec89800914d14d6b53e8a75541c7f622edb1a39f1
parent310fd4c54a84cb1e7b8a8a24a6224f15711333f7
parent3c8261031957cc9418a9e185cdb70084653c936e
Merge branch 'bug-1392' into release