OpenSimMirror/OpenSim/Region/ClientStack/Linden
Melanie 2d3a57a002 Merge branch 'avination'
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
2013-01-19 21:49:33 +01:00
..
Caps Merge branch 'avination' 2013-01-19 21:49:33 +01:00
UDP Merge branch 'avination' 2013-01-19 21:49:33 +01:00