golang/flannel @ c45f758b4359f0e57b383e275f508e8507fae443

Tom Denham ebf5639899 Merge pull request #442 from tomdee/ip-masq-return		8 gadi atpakaļ
..
ipmasq.go	ebf5639899 Merge pull request #442 from tomdee/ip-masq-return	8 gadi atpakaļ
manager.go	808b3061e1 BUILDS: Use vendor directory instead of Godeps	8 gadi atpakaļ
network.go	808b3061e1 BUILDS: Use vendor directory instead of Godeps	8 gadi atpakaļ