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
..
2012-11-22 03:03:37 +00:00
2012-07-13 01:03:28 +01:00
2011-12-05 20:44:20 +00:00
2012-09-14 00:07:39 +01:00
2012-10-19 07:38:36 -04:00
2010-11-21 22:17:25 +00:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2012-07-13 01:03:28 +01:00
2011-01-03 19:40:55 +00:00
2012-03-22 23:31:41 +00:00
2012-07-11 14:27:33 +01:00
2011-12-05 20:44:20 +00:00
2012-07-13 01:03:28 +01:00
2013-02-05 00:23:17 +00:00
2012-09-16 23:41:34 +02:00
2012-07-13 01:03:28 +01:00