Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Apr 2014 15:02:33 +0000 (17:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Apr 2014 15:02:33 +0000 (17:02 +0200)

Trivial merge