Merge branch 'authentication' of github.com:tla/stemmatology
Tara L Andrews [Sat, 14 Jul 2012 17:52:13 +0000 (19:52 +0200)]

Trivial merge