Merge branch 'master' of git.curoverse.com:arvados into 2612-workbench-displays-user...
authorMisha Zatsman <misha-arvados@zatsman.com>
Thu, 24 Apr 2014 20:12:53 +0000 (20:12 +0000)
committerMisha Zatsman <misha-arvados@zatsman.com>
Thu, 24 Apr 2014 20:12:53 +0000 (20:12 +0000)

Trivial merge