From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 2 Mar 2015 16:46:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.2.8~16^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d071ff3f04ae4b14728336d0aedc9ede79a89aef;p=thirdparty%2Fsnapper.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/Makefile.am
---

d071ff3f04ae4b14728336d0aedc9ede79a89aef