From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 Dec 2011 18:20:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~33^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29b7ab7d8118c6278bc133c0cd11957b9c09926b;p=pakfire.git

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

29b7ab7d8118c6278bc133c0cd11957b9c09926b