From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Oct 2011 20:55:52 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.14~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=400b771414fd84ae5a3cb68400697ebc82b24e76;p=pakfire.git

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

400b771414fd84ae5a3cb68400697ebc82b24e76