From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Oct 2011 11:02:48 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/oddments/pakfire
X-Git-Tag: 0.9.14~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb563a65c1d3d5f48f3275fcc4be291c00371831;p=pakfire.git

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

fb563a65c1d3d5f48f3275fcc4be291c00371831