Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Thu, 9 Sep 2010 08:07:13 +0000 (09:07 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 9 Sep 2010 08:07:13 +0000 (09:07 +0100)
commit945d60ea5a52d0c1d41cc63456bd6f60e547e79e
tree7bb2aa5cf6cf9141dd049bcff6b965c33839fc62
parent79276fb43abc429cd5515f81005281e303a16dd8
parent8f5c54f80508d2f2e9387941a0cbadd76e0f5a5b
Merge branch 'master' into openid