Merge branch 'moose' of github.com:tla/stemmatology into moose
authortla <tla@mit.edu>
Wed, 25 May 2011 08:59:12 +0000 (10:59 +0200)
committertla <tla@mit.edu>
Wed, 25 May 2011 08:59:12 +0000 (10:59 +0200)
commita87c42dcf41f90370677e806604a5315cb1658b3
tree392b5b60a5df6994313d0b1652ea4f5cc6627ff4
parent1f563ac315e46e9e05f82b7c803e35d8a4a2fe14
parent5f5e51a5d2ba317f670a5a2eedd10d34b9d51c91
Merge branch 'moose' of github.com:tla/stemmatology into moose

Conflicts:
script/svg_from_csv.pl
script/svg_from_csv.pl