Merge remote-tracking branch 'mfischer/newt' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:02 +0000 (14:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 26 May 2015 12:27:02 +0000 (14:27 +0200)

Trivial merge