Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 May 2014 11:21:40 +0000 (13:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 6 May 2014 11:21:40 +0000 (13:21 +0200)

Trivial merge