Merge branch 'auth-openid' of github.com:jnovack/phorkie into auth-openid
authorJustin J. Novack <jnovack@gmail.com>
Tue, 18 Sep 2012 17:24:15 +0000 (13:24 -0400)
committerJustin J. Novack <jnovack@gmail.com>
Tue, 18 Sep 2012 17:24:15 +0000 (13:24 -0400)

Trivial merge