Commit ae2af38f authored by Georg Brandl's avatar Georg Brandl

Dummy-merge 2.5 branch into 2.6 branch.

parents b5c93e9c 4db2c257
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment