Merge branch 'bug-1280' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:24:39 +0000 (20:24 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:24:39 +0000 (20:24 +0200)
commit73abf595669269baf23e4e5f9770ab81bf6bc244
tree4ab0dea08aebc0a35a3fb422008b3b9e2b41b8d0
parent6d0f414854b2c1aa1da9ec49889ac9bb3b69b966
parentda9630f06ea699f746002a41d167c09a42e7406f
Merge branch 'bug-1280' into release