From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Aug 2011 20:08:22 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.6~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=872357343a2d2d75c4edf4c19059733a3a43b78d;p=pakfire.git

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

872357343a2d2d75c4edf4c19059733a3a43b78d