Skip to content

Commit

Permalink
Merge remote branch 'svenfuchs/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	de/06-git-tools/01-chapter6.markdown
	de/08-git-and-other-scms/01-chapter8.markdown
  • Loading branch information
@schacon
schacon committed Jan 27, 2010
2 parents 5e2cd8f + 1cc98e2 commit ab5daa3
Show file tree
Hide file tree
Showing 4 changed files with 1,209 additions and 108 deletions.
Loading

0 comments on commit ab5daa3

Please sign in to comment.