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

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

f01ffe3c4814a77053a0b7ae9ef595e73d97b435