From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Jul 2015 11:16:45 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.17-core93~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c972b1c467ee3babf60fab4e1b23f72cc7eade74;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' into next
---

c972b1c467ee3babf60fab4e1b23f72cc7eade74