Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:49 +0000 (21:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 19:52:49 +0000 (21:52 +0200)
commit22b736103da26d5b4c19d7389d907ed6741b1ee4
tree3c4aae2a215c017f87f50a8321f3ec607c3855e2
parent052e79ac77d5928340a8b7146030ef12a6f60701
parentf2bae896ea51449e491c4589c1a7702e8b8395d3
Merge branch 'bug-1042' into testserver-stable