From: Tara L Andrews <tla@mit.edu>
Date: Tue, 11 Sep 2012 20:17:36 +0000 (+0200)
Subject: Merge branch 'master' into phylo, deleting stemmaweb
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5f6fe7ab64641827d86598c03408e2260925328d;p=scpubgit%2Fstemmatology.git

Merge branch 'master' into phylo, deleting stemmaweb

Conflicts:
	lib/Text/Tradition/Stemma.pm
	stemmaweb/lib/stemmaweb/Controller/Root.pm
	t/text_tradition_stemma.t
---

5f6fe7ab64641827d86598c03408e2260925328d