estensland/genealogy — pull request #1 by estensland (2014-08-25 00:45:53+00:00)
Title: merge upstream master with branch master

Merging upstream master with local branch