Merge remote-tracking branch 'ipv6/master'
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Sep 2015 14:46:53 +0000 (16:46 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Sep 2015 14:46:53 +0000 (16:46 +0200)

Trivial merge