Merge branch 'master' into 7167-keep-rsync
authorradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 16:32:07 +0000 (12:32 -0400)
committerradhika <radhika@curoverse.com>
Thu, 15 Oct 2015 16:32:07 +0000 (12:32 -0400)
commit22928daa55bc0de7d539793ff27503affac8a39a
tree3944a385e4891e7cf1ed74da5deffe1d2708fe1f
parent3e0f54e6f4d0be807d3e3a0f2b6a49cfef0c6a5e
parentf19e50e99dc4939199a9b9a4381a775d40453267
Merge branch 'master' into 7167-keep-rsync

Conflicts:
sdk/go/keepclient/keepclient.go
sdk/go/keepclient/keepclient.go