Merge branch 'master' into 7252-go-sdk-errors
authorradhika <radhika@curoverse.com>
Thu, 26 Nov 2015 16:01:03 +0000 (11:01 -0500)
committerradhika <radhika@curoverse.com>
Thu, 26 Nov 2015 16:01:03 +0000 (11:01 -0500)
Conflicts:
sdk/go/manifest/manifest_test.go

1  2 
sdk/go/manifest/manifest_test.go

Simple merge