Merge branch 'master' of git.curoverse.com:arvados
authorWard Vandewege <ward@curoverse.com>
Tue, 11 Feb 2014 22:43:21 +0000 (17:43 -0500)
committerWard Vandewege <ward@curoverse.com>
Tue, 11 Feb 2014 22:43:21 +0000 (17:43 -0500)

Trivial merge