Merge branch 'auth-openid' of git://github.com/jnovack/phorkie into auth-openid
authorChristian Weiske <cweiske@cweiske.de>
Mon, 17 Sep 2012 21:01:10 +0000 (23:01 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Mon, 17 Sep 2012 21:01:10 +0000 (23:01 +0200)
commit972d5d8a7e5450d9c3784feda363eee56f3ad269
tree3fce13f330a16e0421e10be6bb7d0bac1746cea2
parentdff68e21ac958ebfb8164bca4cb2143c427f4330
parentac41dd93568256fe5f2cd75530e30bc9b7e1668d
Merge branch 'auth-openid' of git://github.com/jnovack/phorkie into auth-openid