From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Jan 2012 18:32:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09fff7e3c2f345449177d5d171f83ee2b16502f0;p=pakfire.git

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

09fff7e3c2f345449177d5d171f83ee2b16502f0