Melanie
d3892bbd06
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
..
2010-06-08 15:47:14 -07:00
2010-05-16 17:04:13 +03:00
2010-10-30 19:06:47 +01:00
2012-01-22 11:36:04 +00:00
2011-06-11 09:36:57 -07:00
2012-01-30 20:34:32 +00:00
2012-09-27 16:43:18 -07:00
2010-11-21 17:19:24 -08:00
2010-05-16 17:04:13 +03:00
2010-10-18 19:08:26 +01:00
2013-02-05 21:30:12 +00:00
2010-05-16 17:04:13 +03:00
2010-05-16 17:04:13 +03:00
2012-03-06 00:14:21 +00:00