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
..
2013-02-05 00:23:17 +00:00
2013-02-05 00:23:17 +00:00
2010-03-31 21:30:44 -07:00
2011-02-12 20:59:09 +01:00
2010-01-11 02:04:58 +00:00
2010-11-03 02:34:36 +00:00
2013-01-19 02:38:04 +00:00
2013-01-24 18:23:39 +01:00
2012-03-26 14:19:55 +01:00
2010-06-12 07:34:22 +02:00
2013-01-11 16:47:35 -08:00
2010-01-02 21:21:31 +01:00
2009-08-07 20:43:23 +01:00