From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Dec 2012 15:11:29 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.24~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f788e32d7864182f63d3aa17f244ce75590f27d;p=pakfire.git

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

2f788e32d7864182f63d3aa17f244ce75590f27d