From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Fri, 20 Jan 2012 13:07:28 +0000 (+0100)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ea4e683f30880670fb4f892cacf7d846e8f52636;hp=-c;p=scpubgit%2Fstemmatology.git

Merge branch 'master' of github.com:tla/stemmatology
---

ea4e683f30880670fb4f892cacf7d846e8f52636