Merge branch 'master' into 6260-test-datamanager
authorradhika <radhika@curoverse.com>
Tue, 15 Sep 2015 16:24:30 +0000 (12:24 -0400)
committerradhika <radhika@curoverse.com>
Tue, 15 Sep 2015 16:24:30 +0000 (12:24 -0400)
commit558574e31f56db08c82ca7c2b955e74df04242dd
treeb169fec4b09cfdea88306c4f5671deca44a3378a
parent91c929939c115f1abac3c5a3d0497a09901559a6
parent3acd3536404f889e259ed3634015ed66b173ff3d
Merge branch 'master' into 6260-test-datamanager

Conflicts:
services/keepstore/keepstore.go
services/keepstore/keepstore.go