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
..
2012-11-14 11:09:43 -08:00
2012-11-24 03:15:24 +00:00
2012-11-15 10:05:16 -05:00
2011-04-30 09:24:15 -07:00
2012-01-21 19:52:33 +00:00
2013-01-19 21:49:33 +01:00
2012-01-19 23:09:16 +00:00
2013-01-16 19:29:27 +01:00
2013-01-16 19:29:27 +01:00
2012-12-21 22:13:41 +00:00
2011-04-30 09:24:15 -07:00
2012-11-15 10:05:16 -05:00
2011-04-30 09:24:15 -07:00
2011-07-30 03:19:00 +01:00
2011-10-12 19:35:40 +01:00