Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 10 Jul 2014 17:17:45 +0000 (19:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 10 Jul 2014 17:17:45 +0000 (19:17 +0200)

Trivial merge