From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 22 Jul 2011 13:07:26 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.4~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572fcefcde91f2691c496b890bdede797a669c1f;p=pakfire.git

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

572fcefcde91f2691c496b890bdede797a669c1f