From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 Jun 2013 21:25:13 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire
X-Git-Tag: 0.9.26~10^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1341d00de962faa179c245b76c1ef6bab4313788;p=pakfire.git

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

1341d00de962faa179c245b76c1ef6bab4313788