Altoros/bosh — pull request #6 by allomov (2014-01-05 14:28:25+00:00)
Title: Merge google-cpi branch with google-cpi-microbosh

I've created this PR to track changes between this two branches.