From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Jul 2011 15:41:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c73aac451c0a649cf46cf74a87ad1f7237027a96;p=pakfire.git

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

c73aac451c0a649cf46cf74a87ad1f7237027a96