Merge branch 'master' of git.curoverse.com:arvados into 2612-workbench-displays-user...
authorMisha Zatsman <misha-arvados@zatsman.com>
Wed, 23 Apr 2014 16:11:45 +0000 (16:11 +0000)
committerMisha Zatsman <misha-arvados@zatsman.com>
Wed, 23 Apr 2014 16:11:45 +0000 (16:11 +0000)

Trivial merge