]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 665f799 43638be)
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)

Trivial merge
Peter's tree of IPFire 2.x