From: Tara L Andrews <tla\@mit.edu>
Date: Wed, 14 Mar 2012 16:34:02 +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=60e80f1457ed050ef532b4a07b7b8fa6f7c839b0;p=scpubgit%2Fstemmaweb.git

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

60e80f1457ed050ef532b4a07b7b8fa6f7c839b0