From: tla <tla@mit.edu>
Date: Wed, 14 Mar 2012 22:17:08 +0000 (+0100)
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=139ed2955955e15dffde25369196ae7776e404c8

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

139ed2955955e15dffde25369196ae7776e404c8