Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:stefankroes/ancestry
Conflicts:
	README.rdoc
  • Loading branch information
stefankroes committed Oct 26, 2010
2 parents f9c0143 + e25435e commit a3e052d
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a3e052d

Please sign in to comment.