Merge branch 'stable' into release

Browse Source

this is done with -s ours, throwing away the sha1 updates in this
branch.

...

This commit is contained in:

Oswald Buddenhagen

2013-11-11 16:29:21 +01:00

parent 7c73e564bd d5cc1add47

commit 0533da6bc1

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

Diff Content Not Available