Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2012-03-11 00:53:53
Author local date 2012-03-11 00:53:53 +0000
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2012-03-11 00:53:53
Committer local date 2012-03-11 00:53:53 +0000
Commit e4e6f781a61b1b7a7462a39e28e0a85f0fabaab5
Tree 04f25af9832347f1a88890f9d8067f6f0e2155c9
Parent ab235abc46e3d902a7aaf61e589b81f826a2d7a5
Parent 3dbf754651033d8e5d15a2c7b4bab3a803c1e4e6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Affected files:
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
ViewGit