From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Aug 2013 23:03:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
X-Git-Tag: 0.9.26~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=339f288891a616dd1ef00fb6a21ee89125d1eb92;p=pakfire.git

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

339f288891a616dd1ef00fb6a21ee89125d1eb92