Merge pull request #610 from UNINETT/master
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 17 Feb 2016 18:06:51 +0000 (10:06 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 17 Feb 2016 18:06:51 +0000 (10:06 -0800)
Add 'ip' and 'pim' to proto


Trivial merge