Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-06 18:08:40 +01:00
43 changed files with 29189 additions and 24484 deletions

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*