merged conflicting stuff. Added 'me' tag
[zzz-floof.git] / floof / templates / login.mako
2009-07-30  EeveeAdded OpenID registration and login.