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)

Trivial merge