From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Nov 2011 11:22:43 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.18~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7a86f13f55b7f28a8495fcef83ad4043dba2483;p=pakfire.git

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

f7a86f13f55b7f28a8495fcef83ad4043dba2483