From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Apr 2011 10:49:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.3~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2538ff3e36f861695737bbace04d524065426eac;p=pakfire.git

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

2538ff3e36f861695737bbace04d524065426eac