From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 29 Jul 2016 16:58:56 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65a61d88c8a9d73c3315f4ea07a0d5f714ceb2d4;p=people%2Fms%2Fipfire-2.x.git

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

65a61d88c8a9d73c3315f4ea07a0d5f714ceb2d4