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)

Trivial merge