Merge branch 'bug-1396'
authorBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:26:17 +0000 (22:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 9 Aug 2015 20:26:17 +0000 (22:26 +0200)
commit8a5059809e66396eb97dbe1588cd28b8d38eb8a2
treebd8d52e8cdcf5e3a59f64a4dafd9ce392284636f
parent2cbb6d9c9cea8624d474807857ba2f8c81352c15
parent09e2615ec5281b6543f9b70035df6ac4d8b596ae
Merge branch 'bug-1396'