Merge upstream.

Browse source

...

This commit is contained in:

Antoine Vandecreme 2015-06-08 10:38:16 -04:00

parent 7e39a528c0

commit 606d25dbe6

4 changed files with 15 additions and 15 deletions

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

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