From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 Mar 2014 21:38:09 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-rc1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bb66417fa6908750cf083e90805d7e498ff161e;p=ipfire-2.x.git

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

7bb66417fa6908750cf083e90805d7e498ff161e