From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Sep 2013 10:52:43 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/pakfire
X-Git-Tag: 0.9.26~1
X-Git-Url: http://git.ipfire.org/?p=pakfire.git;a=commitdiff_plain;h=076b6156f92e1ab8253e618dbef2b7d076086dc7

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

076b6156f92e1ab8253e618dbef2b7d076086dc7