Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 12:37:05 +0000 (13:37 +0100)
commit56aefb8dcd86aca391285abf84eb53f3e3e03572
tree21f0e38c599f6ce2e8e67400b247a5200636625e
parent155ed85bf5b90fc0419289354904a3f9945dda3f
parentd1eb6d6041d34d98558ada41696e06f7a4d74ca3
Merge branch 'master' into openid