From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 24 Jul 2011 11:34:47 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.4~6^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83430c554114fa14d41efedf82ce9583d10fa639;p=pakfire.git

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

83430c554114fa14d41efedf82ce9583d10fa639