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?a=commitdiff_plain;h=bef7b5c069ce9df5fad1bd1a61434822c02a21c9;p=scpubgit%2Fstemmaweb.git

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

bef7b5c069ce9df5fad1bd1a61434822c02a21c9