Merge branch 'bug-1192' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:04:15 +0000 (22:04 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 14 Oct 2014 20:04:15 +0000 (22:04 +0200)
commit2bb611d7c41ebf27c87f880182f4a51d0a3176bb
tree96a73f770df1568ea2890d00c5c044d4ec1e632c
parent3be9fa53a016c6119e7a57b94d0388384c4ac39d
parent58d2ce2b4829bb3869f7fd9c361358596c2a709e
Merge branch 'bug-1192' into testserver-stable