merge with stable

This commit is contained in:
Georg Brandl 2014-03-01 08:42:58 +01:00
commit f8096e3fa0
3 changed files with 32 additions and 32 deletions