Merge branch 'master' into bigmerge

This commit is contained in:
Melanie
2011-11-11 16:32:08 +00:00

View File

@@ -28,3 +28,5 @@ From the distribution type:
Helpful resources:
* http://opensimulator.org/wiki/Build_Instructions