Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
authorKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 16:00:19 +0000 (17:00 +0100)
committerKlaas Freitag <freitag@owncloud.com>
Wed, 18 Nov 2015 16:00:19 +0000 (17:00 +0100)
commit8abaf920834a516b9b4e2d7b8f49c7561d4a5833
treeeaae114acf81ce6788c4fae8de87984509bea199
parentb0c29d5c66667be201af3bba858305f541c5dd88
parent572d9bdf1af5fc95b10eb82e1f925fb97f971f71
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060