Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 22 Oct 2015 21:38:27 +0000 (23:38 +0200)
commit39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6
treebf7393a2c24814cd72bc75f35466a63976c5628e
parent159c9eb9b1ac6144db50e4677132c51ddf2d8ceb
parent374e636feeade7827e8bea834ee911d15530650f
Merge remote-tracking branch 'origin/master' into next