From: Tara L Andrews <tla\@mit.edu>
Date: Tue, 17 Jan 2012 16:17: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=cc30fbb2b248b386252ee28eddeeaa915994fe6f;p=scpubgit%2Fstemmatology.git

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

cc30fbb2b248b386252ee28eddeeaa915994fe6f