projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3f86fc f235c17)
Merge branch 'master' into 7330-improved-sso-package
authorWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 17:50:44 +0000 (13:50 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 17:50:44 +0000 (13:50 -0400)
refs #7330


Trivial merge