From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Aug 2013 17:39:08 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
X-Git-Tag: 0.9.26~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfd509948a787a3370d9ca5c6360e3efe7b8fbd7;p=pakfire.git

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

cfd509948a787a3370d9ca5c6360e3efe7b8fbd7