Merge remote branch 'svenfuchs/translation-de'
commite3ceb4fe1e49516d9c9754a18d6b172631d61fcd
authorScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 17:47:33 +0000 (2 09:47 -0800)
committerScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 17:47:33 +0000 (2 09:47 -0800)
tree9f4f7a82d808bcfbb05aae544924d2908efa9916
parent4d977201105b5fb9ce52343061329ce40dfa9e22
parentf588b6eee801731d944f7cd461c589e14c4f0be5
Merge remote branch 'svenfuchs/translation-de'

Conflicts:
de/05-distributed-git/01-chapter5.markdown
de/06-git-tools/01-chapter6.markdown