Merge branch 'master' of https://github.com/tla/stemmaweb
tla [Sun, 7 Dec 2014 19:31:31 +0000 (20:31 +0100)]

Trivial merge