Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of github.com:DerSauron/extended_git
Only build manifest from repo-manifest if there is one.
Handle multiple local manifests
Get rid of xml comments in manifest the right way.
Merge branch 'master' of git@github.com:DerSauron/extended_git.git