obonaventure/cnp3 — pull request #120 by oliviertilmans (2014-11-24 13:47:34+00:00)
Title: Update mcq-ipv6.rst

- Fixed Merge conflict leftovers
- Fixed wrong link reference