From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Dec 2011 11:15:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~33^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49f3b6dc09eaf515982af8be733b966ef6e79e6e;p=pakfire.git

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

49f3b6dc09eaf515982af8be733b966ef6e79e6e