From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Sep 2014 13:35:04 +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=1d155cf115a84ec292bdd8299baa0fbb77be67d6;p=ipfire-3.x.git

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

1d155cf115a84ec292bdd8299baa0fbb77be67d6