From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Jan 2012 22:16:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~18^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c50ed1ba5b7eb49cd5861960035b7e07a69836e;p=pakfire.git

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

8c50ed1ba5b7eb49cd5861960035b7e07a69836e