From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 22:35:18 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7add463e51039d0409545f7279d43a66eba1d532;p=people%2Fms%2Fipfire-2.x.git

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

7add463e51039d0409545f7279d43a66eba1d532