From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Oct 2011 13:14:28 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.11~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3a5ac2365ed26285a86d36d035b77fabeb29dc9;p=pakfire.git

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

b3a5ac2365ed26285a86d36d035b77fabeb29dc9