Merge branch 'bug-1281' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:29 +0000 (20:25 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:25:29 +0000 (20:25 +0200)
commitf9c2dfc3296b88328d49a8e4b6417835713a632b
treecaaed23642c2e20ff4c8c4330a3ce115423073a5
parent73abf595669269baf23e4e5f9770ab81bf6bc244
parent8606a043a55a82bef908a80809129386a4bf83ce
Merge branch 'bug-1281' into release