obonaventure/cnp3 — pull request #119 by matttbe (2014-11-24 10:23:13+00:00)
Title: mcq-ipv6: fixed errors during merge

Some lines were not removed due to conflicts.