From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Mar 2011 15:04:50 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.3~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34900eb494c2d50d474ced933ad86d18c746fd90;p=pakfire.git

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

34900eb494c2d50d474ced933ad86d18c746fd90