Melanie 12efac494a Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs

2013-01-19 02:38:04 +00:00

..

Implementation

Merge branch 'master' into careminster

2013-01-19 02:38:04 +00:00

Interface

Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster

2013-01-16 01:11:20 +00:00

Runtime

Merge branch 'master' into careminster

2013-01-19 02:38:04 +00:00