From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 19 Feb 2013 22:24:57 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
X-Git-Tag: 0.9.25~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d51db40cf547bf32317e0ee8d2d07b98df5be302;p=pakfire.git

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

d51db40cf547bf32317e0ee8d2d07b98df5be302