htano/helloworld — pull request #4 by htano (2013-08-12 13:09:34+00:00)
Title: openid_dev.txt

Just conflict !