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

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

43e64df8ebb6da216270549bcc391bef9ce96f64