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-Tag: v2.17-core91~10
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a26a1e16983dbcfc3dd73ab2cddd1fce69223134;hp=36215f793fd455c1721844ee95a535b19636d1d5

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