Merge branch 'master' into 2798-go-keep-client
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 14 May 2014 19:45:05 +0000 (15:45 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 14 May 2014 19:45:05 +0000 (15:45 -0400)

Trivial merge