icvpn meta: also generate icvpn peers for bird4
bird4: correct filter which was copied from bird6
Merge pull request #51 from ohrensessel/correct-bird4

This seems good to me :) syntax ist okay, too.
Merge branch 'master' into v4uplink
tinc: let post-merge scri�pt generate ConnectTo lines

so that puppet does not need to take care of that.
it is not possible to specify peers to exclude with this fix,
which is something that has to be worked on.
functions: Add common network functions.
functions: Replace inline templates with network functions.
tinc: add repo dependency and change folder before executing
Merge pull request #53 from ohrensessel/fix-tinc

tinc: let post-merge script generate ConnectTo lines
Merge pull request #56 from sargon/network-functions

Network functions
Merge branch 'master' into v4uplink
add check gateway resources for vpn and uplink modules
uplink: correct includes