From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Sep 2014 11:26:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=140046253a8861a329c6d218c19b855c0c8ef40a;p=people%2Fstevee%2Fpakfire.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
---

140046253a8861a329c6d218c19b855c0c8ef40a