From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 Apr 2011 19:37:45 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.3~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1254deab7fec1597e0fb30ef621cf03968726ca6;p=pakfire.git

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

1254deab7fec1597e0fb30ef621cf03968726ca6