Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Jun 2014 10:03:09 +0000 (12:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Jun 2014 10:03:09 +0000 (12:03 +0200)

Trivial merge