From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Nov 2011 14:34:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.18~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15ec6658c90c0f217c9f6428147052b2f48d4c13;p=pakfire.git

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

15ec6658c90c0f217c9f6428147052b2f48d4c13