From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 11 Apr 2012 22:21:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.22~9^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76778aec54bbd51632c154c86487ba98c9ddef60;p=pakfire.git

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

76778aec54bbd51632c154c86487ba98c9ddef60