Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 13:49:45 +0000 (14:49 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 13:49:45 +0000 (14:49 +0100)
commit7b9e852c9d53318cfc949fe4ceef2d3b665e2020
treec9c245d602da934749f73c8c8888f74493afe437
parentf7009c57813db1ff579114095c7e959a885323a5
parentabb2bb74a78a8648cb40d46def24d7c2c0b9a0a3
Merge branch 'master' into openid