Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Thu, 13 May 2010 12:36:31 +0000 (13:36 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 13 May 2010 12:36:31 +0000 (13:36 +0100)
commitb917a0eba07184571ea62bb7b735eb48d7c04634
tree7fcb0e1e5886bfa653ad8e90c74f08507a6b4c9f
parentb4c1435655902acf1c6af41cc0745f5e7eb9aa7b
parent70a5a0d9c69c78e679a821370afeb53e4afa2d03
Merge branch 'master' into openid