From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 9 Dec 2011 19:05:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.19~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2d42478b8648adb5f829e9cf45c33046f285d62;p=pakfire.git

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

f2d42478b8648adb5f829e9cf45c33046f285d62