Merge branch 'ipv6'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 30 Oct 2014 08:58:39 +0000 (09:58 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 30 Oct 2014 08:59:18 +0000 (09:59 +0100)
commitecee05390277f57b02d21ffca0195292bde1defa
tree6bf6fd6f0e74acb18908c8713dd3169bdcd62fc3
parent414182fc306d2ca10aff0c1a6074d47b12747069
parent8ab3434424c269cc2ec7cc47f7705099c9462117
Merge branch 'ipv6'

only one minor conflict found in a comment in Makefile
Makefile