removed weird duplication
Merge branch 'jasmine-testing' of github.com:ubiqua/proto into jasmine-testing