Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
authormishaz <misha@curoverse.com>
Fri, 3 Oct 2014 19:49:24 +0000 (19:49 +0000)
committermishaz <misha@curoverse.com>
Fri, 3 Oct 2014 19:49:24 +0000 (19:49 +0000)

Trivial merge