Merge branch 'bug-1302' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 20:01:30 +0000 (22:01 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Sep 2014 20:01:30 +0000 (22:01 +0200)
commit17c191d1ad8ff0f5388a4bccbdc40cf02e89a864
treed017bd78b37c0b02cc7cc626ba904fc4397ced54
parent192c3cd186369b5e6e5fe3bd37f6aebf2b49a162
parent6987cf676cb68e41b62766a3ece73fc01b6645e7
Merge branch 'bug-1302' into testserver-stable