From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 3 Aug 2011 20:53:11 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.5~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d580e8c1e62d9864fb23443672a0bbe8aea8ee68;p=pakfire.git

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

d580e8c1e62d9864fb23443672a0bbe8aea8ee68