From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Aug 2013 17:56:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.26~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c44a768234eb0db9d186400884fcbb80f3698e9f;p=pakfire.git

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

c44a768234eb0db9d186400884fcbb80f3698e9f