Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:31:34 +0000 (23:31 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:31:34 +0000 (23:31 +0200)
commite48a70e845418641c8d8cc048f4c4f855a1d1606
tree08512428b5514edbbaf56aae0dc6ef1aef714ea2
parent61c3a76a2c9f34f1202b1d7a5cb441ef2d7e4fe6
parent7a845c373be2d462ae46692086218df8130c4e31
Merge branch 'bug-1131' into testserver-stable