Merge branch 'master' into 2449-keep-write-blocks
authorTim Pierce <twp@curoverse.com>
Fri, 11 Apr 2014 21:28:39 +0000 (17:28 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 11 Apr 2014 21:28:39 +0000 (17:28 -0400)
commit2b571044517c19a2d3d20e5d4a3197a653667425
treefa1b07bf369e79767d061d793b783f2e9a623d71
parentdb59e780872b7e7e5c9b1ee94f8e0ae136043d74
parent18afe83690fd311ff7019abdad7b63a02574d9a8
Merge branch 'master' into 2449-keep-write-blocks
services/keep/keep.go