Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:51:31 +0000 (23:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:51:31 +0000 (23:51 +0200)
commit136eecff05435caae94571de1165a76cfb11b1d2
tree0e49547232cb2c299dc8445cf1fa7dd83fe1f61b
parent93cab2be50e4fbb9b1c49ceaec54ed40fefe9850
parentdd6c8d16286f10c22b0fe7e4908825e18db9d703
Merge branch 'bug-1131' into testserver-stable