Permalink
Browse files

Merge branch 'master' of github.com:stefankroes/ancestry

Conflicts:
	README.rdoc
  • Loading branch information...
2 parents f9c0143 + e25435e commit a3e052d154471e573144c75494c7bdde1e7fff10 @stefankroes stefankroes committed Oct 26, 2010
Showing with 0 additions and 0 deletions.

0 comments on commit a3e052d

Please sign in to comment.