Merge branch 'master' of git.clinicalfuture.com:arvados
authorWard Vandewege <ward@clinicalfuture.com>
Tue, 19 Nov 2013 17:21:43 +0000 (12:21 -0500)
committerWard Vandewege <ward@clinicalfuture.com>
Tue, 19 Nov 2013 17:21:43 +0000 (12:21 -0500)

Trivial merge