Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Apr 2014 20:24:24 +0000 (22:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 18 Apr 2014 20:24:24 +0000 (22:24 +0200)

Trivial merge