Melanie 7cf377fff0 Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-04-10 13:20:55 +01:00
..
OpenSim.Region.Physics.BulletSPlugin.dll.config	…
OpenSim.Region.Physics.UbitOdePlugin.dll.config	…