Merge branch 'bug-1382' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:29:37 +0000 (22:29 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 20:29:37 +0000 (22:29 +0200)
commitd50db99ec2e841712775f2ca81b9b20348f61f09
treeba37915eee6ab2887d6091dfb560b8ff97f5358b
parent675fb01ecddce3316df0e678cb0b68345de2e7be
parent5ef25b1670e2fae76f1719c3da2248b2e69a8fd1
Merge branch 'bug-1382' into testserver-stable