Merge branch 'master' of github.com:tla/stemmatology
authorTara L Andrews <tla@mit.edu>
Tue, 11 Sep 2012 08:10:13 +0000 (10:10 +0200)
committerTara L Andrews <tla@mit.edu>
Tue, 11 Sep 2012 08:10:13 +0000 (10:10 +0200)
commitf761f9a7802815a5e3aa1068cd7aa17dd83ff8e5
treed9c282e7b6e109470af6932ef791841149ad5c7e
parent2bfac19751089df74b9382ef3d06180560cdca7f
parent3f7346b1ac3ccc20e75cf0c8acb9081a8f100be6
Merge branch 'master' of github.com:tla/stemmatology

Conflicts:
stemmaweb/lib/stemmaweb/Controller/Root.pm
lib/stemmaweb/Controller/Root.pm