merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 08:11:55 +01:00
commit 76c49a2fb9
6 changed files with 1 additions and 1 deletions