From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Feb 2015 23:44: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=9ba744544b6a66f464836d852d7e577811107bf8;p=ipfire.org.git

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

9ba744544b6a66f464836d852d7e577811107bf8