Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 22:07:13 +0000 (23:07 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 22:07:13 +0000 (23:07 +0100)
commitad332491fda539e923d49e617f5be99efabdfc3b
tree4f0740bdb4d1a727077ac28146b5bebe2b8e297d
parentff20ab4b121be49c53da3b53aa09f87e0e14cb1f
parenta9194861cb96f66fb980ec96381bb5d1972dc3cd
Merge branch 'bug-1354' into testserver-stable