Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:24:52 +0000 (23:24 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:24:52 +0000 (23:24 +0200)
commit61c3a76a2c9f34f1202b1d7a5cb441ef2d7e4fe6
treed757e852fc996c0e19f192eb63e3878f108d70f4
parentbd982b20b2f7f248c19c2408db18243c76fc58be
parent5ab84243dc07d604bea4142fa245a7374b7cdea3
Merge branch 'bug-1131' into testserver-stable