From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Dec 2011 22:30:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c96e9b7a14d3ffe3dedecd76c81ae54c9d049984;p=pakfire.git

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

c96e9b7a14d3ffe3dedecd76c81ae54c9d049984