Merge branch 'master' into history
authorAndy Allan <andy@gravitystorm.co.uk>
Sat, 24 Mar 2012 11:42:44 +0000 (11:42 +0000)
committerAndy Allan <andy@gravitystorm.co.uk>
Sat, 24 Mar 2012 11:42:44 +0000 (11:42 +0000)
commit300a5b751f2845a6bdf8308333669f10cebf7271
treecfeff989ab8675912a2b52e15e753726a3cf5421
parent9fa501feaa5c90aaae811b2d9e24f5e00daccb2d
parente27f26dbc589e7107294a6eb8e939ad6bb6cc970
Merge branch 'master' into history

Conflicts:
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/Entity.as
net/systemeD/halcyon/connection/EntityCollection.as
net/systemeD/halcyon/connection/Node.as
net/systemeD/halcyon/connection/Relation.as
net/systemeD/halcyon/connection/Way.as
net/systemeD/halcyon/connection/XMLBaseConnection.as
net/systemeD/halcyon/connection/XMLConnection.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/controller/ControllerState.as