From: Tara L Andrews <tla\@mit.edu>
Date: Fri, 3 Feb 2012 14:16: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=940460c678db37fa21ba9462f8fc24f58cd93df1;p=scpubgit%2Fstemmatology.git

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

940460c678db37fa21ba9462f8fc24f58cd93df1