4875: Merge branch 'master' into 4875-keepclient-test-race
authorTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:29:17 +0000 (16:29 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 29 Dec 2014 21:29:17 +0000 (16:29 -0500)
Conflicts:
sdk/go/keepclient/keepclient_test.go

1  2 
sdk/go/keepclient/keepclient_test.go

Simple merge