Merge branch 'master' of github.com:tla/stemmaweb
Tara L Andrews [Wed, 19 Sep 2012 17:27:38 +0000 (19:27 +0200)]

Trivial merge