Merge branch 'bug-1357' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 20:55:30 +0000 (21:55 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 13 Jan 2015 20:55:30 +0000 (21:55 +0100)
commited1d1b8880770a613a011668e93664dcd18c3dc7
treeb7e4d80ff611a777929a2646d0393264d9349aff
parent14aa05a79dbc77f5dd7aadf600afd095c0605ef2
parentea7a56ff5787c4e9d71f3d17f4e93d87745cf92d
Merge branch 'bug-1357' into testserver-stable