From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jun 2015 12:30:44 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a26a1e16983dbcfc3dd73ab2cddd1fce69223134;p=people%2Fms%2Fipfire-2.x.git

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

a26a1e16983dbcfc3dd73ab2cddd1fce69223134