Merge remote-tracking branch 'meitelwein/web-gui-ipv6' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:24 +0000 (00:39 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 23 Jan 2016 00:39:24 +0000 (00:39 +0000)
commitc97698a8f4b2520e198521c3d67a25efc3ad3776
treefb6b992858a22caba1a696ff2bebe42f6e397985
parent665f79926d025fec413531c397ccd6998583237e
parent43638be58b2ae99bd07a420c5f340222e2744feb
Merge remote-tracking branch 'meitelwein/web-gui-ipv6' into next