Merge pull request #606 from progit-de/next

[de] First translation of chapter 6.7 (subtree merge) and 6.8 (summary)