From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Oct 2011 21:57:42 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.14~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb6f2f3724923ff2478fbb3f95ab4627bddeef30;p=pakfire.git

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

cb6f2f3724923ff2478fbb3f95ab4627bddeef30