Merge branch 'master' of git.clinicalfuture.com:arvados
authorWard Vandewege <ward@clinicalfuture.com>
Wed, 10 Jul 2013 14:40:38 +0000 (10:40 -0400)
committerWard Vandewege <ward@clinicalfuture.com>
Wed, 10 Jul 2013 14:40:38 +0000 (10:40 -0400)

Trivial merge