Merge branch 'bug-932' master
authorBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 20:32:10 +0000 (22:32 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 20:32:10 +0000 (22:32 +0200)
commit13901dd1a18dd32d7a9c796c241f443ceb1cd9c0
tree4f8d4666064235f0093309cdf0d420e801102603
parent7f20913d8b39bb701254d1e9e326578b1590721d
parent870a936694177aa3f73386dc36bbed31f8c84a64
Merge branch 'bug-932'