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)
commit8d2375dc72b857857cd164f452e103b86ed110cd
tree5d4537253d1de028924fd6f86dd91aee73a04541
parent6dbf5501308792a7ab375a8be5562e8c85a48628
parentbd7506015c1976511ccd333417da2aec8e5e18f6
Merge branch 'auth-openid' of github.com:jnovack/phorkie into auth-openid