From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Mar 2015 22:11:09 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20813528ae5a769a69f3ff20283a9a05bd8dd7a7;p=ipfire.org.git

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

20813528ae5a769a69f3ff20283a9a05bd8dd7a7