From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 Dec 2014 13:20:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e63ec62158eedb421dfa8ed67908e9ccd7666015;p=ipfire-3.x.git

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

e63ec62158eedb421dfa8ed67908e9ccd7666015