Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
authorTom Clegg <tom@curoverse.com>
Fri, 13 Feb 2015 21:22:55 +0000 (16:22 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 13 Feb 2015 21:22:55 +0000 (16:22 -0500)

Trivial merge