From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 Feb 2014 13:38:02 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-beta2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=178df99a871760cfa773543f3258c04c76fc5d6f;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

178df99a871760cfa773543f3258c04c76fc5d6f