Merge branch 'master' of github.com:tla/stemmaweb
Tara L Andrews [Fri, 29 Aug 2014 21:10:14 +0000 (23:10 +0200)]

Trivial merge