Merge branch 'bug-1383' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:20:32 +0000 (22:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:20:32 +0000 (22:20 +0200)
commit675fb01ecddce3316df0e678cb0b68345de2e7be
treee22c4a2b17fd3c832da1fb67a344f62a2da906de
parent22b736103da26d5b4c19d7389d907ed6741b1ee4
parent0d35a10b2c7ca38ea7bab56d872b1001d81a6735
Merge branch 'bug-1383' into testserver-stable