Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:02 +0000 (21:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 20 Nov 2013 20:43:02 +0000 (21:43 +0100)

Trivial merge