Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 May 2014 09:25:48 +0000 (11:25 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 May 2014 09:25:48 +0000 (11:25 +0200)

Trivial merge