Merge branch 'master' of https://github.com/tla/stemmaweb into nodemerge
tla [Wed, 17 Jun 2015 13:28:39 +0000 (15:28 +0200)]

Trivial merge