From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 22 Oct 2015 11:11:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.17-core95~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=159c9eb9b1ac6144db50e4677132c51ddf2d8ceb;p=people%2Fpmueller%2Fipfire-2.x.git

Merge remote-tracking branch 'origin/master' into next
---

159c9eb9b1ac6144db50e4677132c51ddf2d8ceb