web: Merged changes from trunk into live

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

Committed By John Du Hart

Ah, cool.