From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 17 Oct 2015 23:28:28 +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=61e7253b1ff164dbdb10aac3dda98a0145cfc326;p=ipfire-3.x.git

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

61e7253b1ff164dbdb10aac3dda98a0145cfc326