From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Mar 2013 18:43:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.25~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=866fd29fdd5b7762e8c33bc42c96c85edca90bee;p=pakfire.git

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

866fd29fdd5b7762e8c33bc42c96c85edca90bee