Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:43 +0000 (15:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 May 2014 13:18:43 +0000 (15:18 +0200)

Trivial merge