From: Tara L Andrews <tla@mit.edu>
Date: Wed, 7 Mar 2012 12:31:58 +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=a15d1f5ab9ea984a964f7cb176ffcd959287b370;p=scpubgit%2Fstemmatology.git

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

a15d1f5ab9ea984a964f7cb176ffcd959287b370