From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Oct 2011 18:50:01 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.17~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d0466149cabbd4a2d279c88b493565660581631;p=pakfire.git

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

4d0466149cabbd4a2d279c88b493565660581631