Merge branch 'bug-1357' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 25 Jan 2015 11:57:05 +0000 (12:57 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 25 Jan 2015 11:57:05 +0000 (12:57 +0100)
commita50662743047c32946e49bbce20979425667a557
treebade749dc0d3443c5c4e00f035b7c98cfcff465d
parentfa68e3ded553ffb0e5808044c457b13c6d6e4d51
parent6412d38dd2361032b67330def4702ea04b4263a3
Merge branch 'bug-1357' into testserver-stable