Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Thu, 9 Sep 2010 08:06:12 +0000 (09:06 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 9 Sep 2010 08:06:12 +0000 (09:06 +0100)
commit79276fb43abc429cd5515f81005281e303a16dd8
tree61b7c97fb09d114440506149a8eb18ee623d735e
parenta22b0c1b64a67e46bcecbce41b07fc7a53fb0632
parent1980cf1da827655ed2169b0c2c6158367c2845dc
Merge branch 'master' into openid