Merge pull request #1481 from eyakubovich/flannel-0.5.3

This commit is contained in:
Eugene Yakubovich 2015-08-27 12:21:35 -07:00
commit dadcf9cb3e