Merge branch 'master' of github.com:tla/stemmaweb
Joris van Zundert [Fri, 5 Oct 2012 22:53:56 +0000 (00:53 +0200)]

Trivial merge