Merge remote-tracking branch 'stevee/core90-fixes'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 May 2015 20:02:46 +0000 (22:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 13 May 2015 20:02:46 +0000 (22:02 +0200)

Trivial merge