From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 2 Aug 2016 08:00:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.3.3^2~4
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f3f80194eb2d32a641b7edd7c1b197e499cb1892;p=thirdparty%2Fsnapper.git

Merge remote-tracking branch 'upstream/master'
---

f3f80194eb2d32a641b7edd7c1b197e499cb1892