From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Dec 2012 08:18:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.24~8^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481fa9e26b036edfaf98d1018305173acf4e5cbc;p=pakfire.git

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

481fa9e26b036edfaf98d1018305173acf4e5cbc