Superpat/ancientreligions — pull request #2 by jonseverinsson (2013-06-17 13:45:37+00:00)
Title: Druidism

Please merge my 'druidism' branch into yours.

You are also going to have to reset your 'master' and 'hellenic' branches, as I had to rewrite their history, as your 'druidism' branch had rewritten the history of my fixup commits, and I thought it simpler to use your revisionist history than my original one ;-).

git fetch jonseverinsson
git checkout master
git reset --hard jonseverinsson/master
git push origin +master:master
git checkout hellenic
git reset --hard jonseverinsson/hellenic
git push origin +hellenic:hellenic