web: Merged changes from trunk into live

[garry]

[B]Revision 128[/B]
[INDENT]Merged changes from trunk into live[/INDENT] [B]Changed Files:[/B]
[LIST]
[*]facepunch.com/branches/live/fp/includes/openid.php
[*]facepunch.com/branches/live/fp_openid.php
[/LIST]
[B]Added Files:[/B]
[LIST]
[*]facepunch.com/branches/live/includes/config.php
[/LIST]

Committed By [B]John Du Hart[/B]

[Morphus]

Ah, cool.