From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Aug 2011 20:57:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.6~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eef207d3a5282ebf71392968e4972a049aea3028;p=pakfire.git

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

eef207d3a5282ebf71392968e4972a049aea3028