Squashed 'sub/' changes from 61d3ac2..e02e8ae

e02e8ae Add another line
411b70f (super) Add a line in sub-project

git-subtree-dir: sub
git-subtree-split: e02e8aee25b7bd8132346fc0a58d840376030c80
Merge commit '6f6ea5e35641a315bb30fe9b25e475fa21e54966'

Conflicts:
	sub/file-in-sub-project.txt
This somehow got lost in the previous merge ...