Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:21:41 +0000 (16:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:21:41 +0000 (16:21 +0200)

Trivial merge