From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 20 Nov 2011 00:29:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.18~14^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1280e90c470952f87f3390906b7c0a4af66856f;p=pakfire.git

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

e1280e90c470952f87f3390906b7c0a4af66856f