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

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

5c388edcf357eb3aa42c917a82fc55029f4e4051