Merge

.hgtags

doc/contributions.txt

indra/CMakeLists.txt

indra/cmake/GoogleMock.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/run_build_test.py

indra/copy_win_scripts/start-client.py

indra/develop.py

indra/lib/python/indra/util/llperformance.py

indra/lib/python/indra/util/llversion.py

indra/lib/python/indra/util/simperf_proc_interface.py

indra/lib/python/indra/util/test_win32_manifest.py

indra/linux_updater/linux_updater.cpp

indra/llcommon/llavatarname.cpp

indra/llcommon/llversionviewer.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llmessage/tests/llhost_test.cpp

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llmessage/tests/testrunner.py