projects / arvados-dev.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 381b79b 1a4ea52)
Merge branch 'master' into 6096-package-rails-apps
authorWard Vandewege <ward@curoverse.com>
Fri, 5 Jun 2015 20:29:18 +0000 (16:29 -0400)
committerWard Vandewege <ward@curoverse.com>
Fri, 5 Jun 2015 20:29:18 +0000 (16:29 -0400)

Trivial merge