Merge branch 'master' into 9956-keepstore-config
authorTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 08:32:37 +0000 (04:32 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 08:32:37 +0000 (04:32 -0400)
commitb9d2799dfebae724dda3b3e28641116ca5daf5c7
tree91d615df47a3c5b7f9a9fbfc2555286d7222200c
parent82cc494a64aaac576dfefe0487faafdda82482bc
parent8b03f0b0e66190b35c55ce1f0917dd2104b8a0b9
Merge branch 'master' into 9956-keepstore-config

Conflicts:
services/keepstore/keepstore.go