5824: Merge branch 'master' into 5824-keep-web-workbench
authorTom Clegg <tom@curoverse.com>
Wed, 11 Nov 2015 17:11:46 +0000 (12:11 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 11 Nov 2015 17:11:46 +0000 (12:11 -0500)
commit206451cdcaee133836761024c8517629de429f10
tree0968e8d0666f34ddc9749920435faba157d9aa76
parent51169558811743fcd2e21e4b9397f9fb2d4766b0
parent3cdc4e8e3668b783f42f887f6a8662b66ecb7f9a
5824: Merge branch 'master' into 5824-keep-web-workbench

Conflicts:
services/keepproxy/keepproxy_test.go
sdk/go/arvadosclient/arvadosclient_test.go