Permalink
Browse files

Merge branch 'master' of github.com:chrisle/gattica

Conflicts:
	README.md
  • Loading branch information...
2 parents 1929324 + 99aa1d5 commit 2f8e5aac9eda88c64ef3111c2ce69a58adcc8af5 Chris Le committed Jan 24, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit 2f8e5aa

Please sign in to comment.