Merge remote-tracking branch 'origin/2.1'
authorDaniel Molkentin <danimo@owncloud.com>
Wed, 10 Feb 2016 11:57:03 +0000 (12:57 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Wed, 10 Feb 2016 11:57:03 +0000 (12:57 +0100)
commit41d8d77535e39644c84756775bb703e469032115
tree2846c1c666a39b73db50915e87287317f5e6fb66
parente9307bb797a81359a2ff7abddd01c3937ec6941b
parentc98bf174ed7e92bd22f6bfc4efafda82769e346c
Merge remote-tracking branch 'origin/2.1'