Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:31 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:50:31 +0000 (23:50 +0200)
commit06a25c7e2ea8a2e7bf607389fd77b630bf774b6e
treee7a7c8f53bc2e531f16b3780b99b98593a3f7a56
parent68a407a7b937b34818190626010faafc5795bbf6
parent30ed0e2c2da2458608e08479c0b7533c93ff598a
Merge branch 'bug-1042' into testserver-stable