From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 1 May 2012 12:32:42 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.23~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0475d659ff7e60006d4caab273e6d0a24ab272bc;p=pakfire.git

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

0475d659ff7e60006d4caab273e6d0a24ab272bc