Merge branch 'master' of https://github.com/tla/stemmaweb
tla [Mon, 20 Jan 2014 08:30:35 +0000 (09:30 +0100)]

Trivial merge