From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 10 Feb 2013 14:34:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.25~16^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be7a4d0229e1ad4c8d624196b643084c2d7a9c8e;p=pakfire.git

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

be7a4d0229e1ad4c8d624196b643084c2d7a9c8e