Merge remote-tracking branch 'origin/2.0'
authorDaniel Molkentin <danimo@owncloud.com>
Wed, 4 Nov 2015 13:25:14 +0000 (14:25 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Wed, 4 Nov 2015 13:25:14 +0000 (14:25 +0100)
commitb82ffb52c7fb6b275dfdc6e8516706ab968bfe8f
treed5f353e24ab6e6ef1ce05b036912d4745d3f201a
parent43800e3d1c01bb74310b0c33901289ea0c47a8cf
parent03cc67a2b1667617c9f2ee7eba8f8d37aad66043
Merge remote-tracking branch 'origin/2.0'