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)
commita5ed26a2a1d01646ac511b925f56484be2e8819a
tree5238b6f63799978387588c0a10734c37bf00cb3a
parent040a541c74913c01ee3517273a7be30c510cc620
parent72189590b0fc8555afaf54d7a27eb609b2e157d0
Merge branch 'master' into 7252-go-sdk-errors

Conflicts:
sdk/go/manifest/manifest_test.go
sdk/go/manifest/manifest_test.go