From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 16 Dec 2011 15:17:18 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.19~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2cd3e3903b9c6597afc6f7f955304aa71a7a20;p=pakfire.git

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

5a2cd3e3903b9c6597afc6f7f955304aa71a7a20