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

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

bdff61c4ac17aca6e298c6d70dde07013501d92f