Merge branch 'bug-1391'
authorBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:12:44 +0000 (22:12 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 4 Aug 2015 20:12:44 +0000 (22:12 +0200)
commit2cbb6d9c9cea8624d474807857ba2f8c81352c15
tree458025116c2f02d9f4a576c8c9459d1373598dc4
parent97cfec770519e6f1d18b1d1696abcdcb81c3c86c
parentf9a2da80b9e9530aa3afb5670aa0fbf56233270c
Merge branch 'bug-1391'