Merge branch 'master' of git.curoverse.com:arvados
authorWard Vandewege <ward@curoverse.com>
Thu, 9 Jan 2014 22:17:30 +0000 (17:17 -0500)
committerWard Vandewege <ward@curoverse.com>
Thu, 9 Jan 2014 22:17:30 +0000 (17:17 -0500)

Trivial merge