From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Sep 2011 14:24:58 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.10~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1904a7961533d5362a650d09323c7604534bcffd;p=pakfire.git

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

Conflicts:
	po/pakfire.pot
---

1904a7961533d5362a650d09323c7604534bcffd