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

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

9f781b74cd025f2320646a139d12393a41432f2e