From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 26 Feb 2012 11:39:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36ee37ab5e8418ff558e29e88b9a863fb8843cec;p=pakfire.git

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

Conflicts:
	po/pakfire.pot
---

36ee37ab5e8418ff558e29e88b9a863fb8843cec