From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 7 Apr 2015 06:02:55 +0000 (+0200)
Subject: Merge remote-tracking branch into 1.8
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1803^2~227
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50ba73860cf382a4d74732bc7556022d2269331b;p=nextcloud-desktop.git

Merge remote-tracking branch into 1.8
---

50ba73860cf382a4d74732bc7556022d2269331b