Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 May 2015 18:20:29 +0000 (20:20 +0200)

Trivial merge