Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:38:42 +0000 (23:38 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:38:42 +0000 (23:38 +0200)
commit286fb6de79823017b85aece204de48de327811d1
tree50d305656402ce1816b332d069fc0561c42ba7b9
parente48a70e845418641c8d8cc048f4c4f855a1d1606
parent44af4892a37a768b7c314a87450be7d3255ac3ff
Merge branch 'bug-1131' into testserver-stable