Merge branch 'master' of https://github.com/tla/stemmaweb into nodemerge
authortla <tla@mit.edu>
Wed, 17 Jun 2015 13:28:39 +0000 (15:28 +0200)
committertla <tla@mit.edu>
Wed, 17 Jun 2015 13:28:39 +0000 (15:28 +0200)
commit80c4b652c73cd313bc3cffd9d6e36c58e41e9833
treeb2fa31b4ee0e713eb5e8f9a68ea0989fe0603d8e
parent32f1389102b080b2ce404b57d9612daa601866e8
parentb4d8654a763aadc1c005a0d39861850e96862817
Merge branch 'master' of https://github.com/tla/stemmaweb into nodemerge