From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Mar 2012 17:03:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.21~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec7f38470401ea2ab962ebf1d31c59c14b8674d0;p=pakfire.git

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

ec7f38470401ea2ab962ebf1d31c59c14b8674d0