Merge branch 'bug-1316' into bug-1050
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:04 +0000 (23:21 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:21:04 +0000 (23:21 +0200)
commit3abe7dcec217fd183e042e66e4356738af019e41
tree9877d4e1509557450eb8f059bc89fc3a389d4568
parenta17af2d6b7f9bd5d37e9c48518aad9a14ac256ca
parent6ce954919e4f60c8d03f647ff6d6fbc77cc51133
Merge branch 'bug-1316' into bug-1050