Merge branch 'master' into 4.0-pre-not-stable

Browse source

...

This commit is contained in:

Nico Schottelius 2014-01-21 14:05:44 +01:00

parent 295c21b4e9 6746ba8279

commit ba0c56efbd

6 changed files with 58 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files