From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 21 May 2011 19:59:09 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.3~9^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e72342f6ba4b52138f4e4556a2f225314f641c7;p=pakfire.git

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

4e72342f6ba4b52138f4e4556a2f225314f641c7