From: tla <tla@mit.edu>
Date: Fri, 15 Jun 2012 20:44:44 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tla/stemmatology
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=83cc24db722c0a64adce1fc73b23347d7cd43b60;p=scpubgit%2Fstemmatology.git

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

83cc24db722c0a64adce1fc73b23347d7cd43b60