Merge branch 'master' into snapshotserver
authorAndy Allan <andy@gravitystorm.co.uk>
Mon, 20 Jun 2011 12:04:43 +0000 (13:04 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Mon, 20 Jun 2011 12:04:43 +0000 (13:04 +0100)
commitd4df64e92692519288e96a187d2ca21af4bfdc38
tree89eba540158a35a9b3da6e5c60405ff3c6523a4f
parentba681340a3d96c76a23b655ef04037fb02664f0a
parentaa899caa24693653fcc338ec2887430556387fab
Merge branch 'master' into snapshotserver

Conflicts:
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/XMLBaseConnection.as