Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 19:30:50 +0000 (21:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2014 19:30:50 +0000 (21:30 +0200)

Trivial merge