Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 21:35:35 +0000 (22:35 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 20 Jan 2015 21:35:35 +0000 (22:35 +0100)
commitff20ab4b121be49c53da3b53aa09f87e0e14cb1f
treea2fd7d5e131182731c176654025fa3a32ffd4e17
parent8b0230a357ffdd904457b408aa1f4621b4b5a9e7
parent1b84a19e599e5cf311a7950f955ae61fbff8a015
Merge branch 'bug-1354' into testserver-stable