Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:11:01 +0000 (12:11 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:11:01 +0000 (12:11 +0100)
commit996e60614d9d5a2e43b0ca246d9786d569fb7be2
tree0fdd4a325853abc52c161337a5c47c45a122adad
parent30693acc875e73972150146eb58afa17ea6db657
parent8657cd4724619b22a7c99b2400a0faa36229ae71
Merge branch 'master' into openid