From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Dec 2011 22:40:47 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~33^2~9^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb036254f28bf4a763ad38d7a49d7dd3b655f706;p=pakfire.git

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

bb036254f28bf4a763ad38d7a49d7dd3b655f706