Melanie afca742392 Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs		2011-11-14 20:03:47 +00:00
..
Interfaces	Merge branch 'master' into bigmerge	2011-11-14 20:03:47 +00:00
Scenes	Merge branch 'master' into bigmerge	2011-11-14 20:03:47 +00:00
ModuleLoader.cs	Merge branch 'master' into careminster-presence-refactor	2011-04-12 00:27:39 +01:00