From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 3 May 2015 17:36:27 +0000 (+0200)
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=ca33e8561aef4c5dd9a156c0fd3bc6bbbdd894bc;p=ipfire-3.x.git

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

ca33e8561aef4c5dd9a156c0fd3bc6bbbdd894bc