From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 3 Feb 2012 18:30:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~14^2^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e4e5e311f4dc8640d29340452ddfc4e4649fe99;p=pakfire.git

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

6e4e5e311f4dc8640d29340452ddfc4e4649fe99