Merge branch 'master' into phylo, deleting stemmaweb
authorTara L Andrews <tla@mit.edu>
Tue, 11 Sep 2012 20:17:36 +0000 (22:17 +0200)
committerTara L Andrews <tla@mit.edu>
Thu, 13 Sep 2012 11:27:51 +0000 (13:27 +0200)
commit5f6fe7ab64641827d86598c03408e2260925328d
tree4e46f2100a1b5cfd03cfe945b1f5c3534751175b
parentfdab1c0f0fde8d290e42102feb41f21c95beb4c0
parent53b60c21b8bfc3858184cbb02cc20a83e64d407b
Merge branch 'master' into phylo, deleting stemmaweb

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