From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 11 Feb 2012 12:02:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.20~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b052baaf5fd4ede1851fef223157b5fd948d15a;p=pakfire.git

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

0b052baaf5fd4ede1851fef223157b5fd948d15a