Merge branch 'stable-2.8'

Browse Source

A couple of commits from master accidentally got included in
the stable-2.8 branch, and have been reverted there.

This merge is done with strategy 'ours' to prevent those reverts
from happening on master, where the commits are actually wanted.

Change-Id: Ie1c16ca13d397483e36759370805bcfb8e83fedb

...

This commit is contained in:

David Pursehouse

2013-10-24 11:27:58 +09:00

parent e55d199aee ed31e1c2ad

commit 34b66c42e6

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