From: Tara L Andrews <tla\@mit.edu>
Date: Sun, 15 Apr 2012 21:53:53 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmatology.git;a=commitdiff_plain;h=0f3a008ed4486932a0a196996a4473dd1b15a717

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

0f3a008ed4486932a0a196996a4473dd1b15a717