From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Mar 2013 19:01:02 +0000 (+0000)
Subject: Merge branch 'master' of git://git.ipfire.org/pakfire
X-Git-Tag: 0.9.25~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5925709f563fc467e530e29e0a4d8a5634045dac;p=pakfire.git

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

5925709f563fc467e530e29e0a4d8a5634045dac