Merge remote-tracking branch 'amarx/core90' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 3 May 2015 10:52:50 +0000 (12:52 +0200)

Trivial merge