Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Apr 2014 14:49:33 +0000 (16:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Apr 2014 14:49:33 +0000 (16:49 +0200)

Trivial merge