From: Matthias Fischer <fischerm@ipfire.org>
Date: Mon, 4 May 2015 16:46:27 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core92~10^2~2^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3a0aefba160c9e9e5b16e49d7a5f7843585695d;p=ipfire-2.x.git

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

a3a0aefba160c9e9e5b16e49d7a5f7843585695d