From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Feb 2012 12:33:52 +0000 (+0100)
Subject: Merge branch 'master' into signatures
X-Git-Tag: 0.9.22~60^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1c23b00cf399bda5724864131ed96a123fbcd17;p=pakfire.git

Merge branch 'master' into signatures
---

f1c23b00cf399bda5724864131ed96a123fbcd17