Merge branch 'bug-1383' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 9 May 2015 20:51:02 +0000 (22:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 9 May 2015 20:51:02 +0000 (22:51 +0200)
commitdabfc656c18e1888481b52345660a238f158cae9
treedb6963200d3948fd573727511f0765f57f1d4b5a
parentd50db99ec2e841712775f2ca81b9b20348f61f09
parentd3f6224c5a88278a730d2ee1dabde13718b3dec1
Merge branch 'bug-1383' into testserver-stable