Merge branch 'new-git-hooks' of git.curoverse.com:arvados-dev into new-git-hooks
authorWard Vandewege <ward@curoverse.com>
Thu, 5 Jun 2014 17:52:39 +0000 (13:52 -0400)
committerWard Vandewege <ward@curoverse.com>
Thu, 5 Jun 2014 17:52:39 +0000 (13:52 -0400)

Trivial merge