From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Mar 2015 13:15:33 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e0af8a41c79252342943f22ad7a8b8b12aa6773;p=ipfire.org.git

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

9e0af8a41c79252342943f22ad7a8b8b12aa6773