Merge pull request #1030 from marineam/flannel

flannel: bump revision
This commit is contained in:
Michael Marineau 2014-12-29 10:47:44 -08:00
commit 985324b486