merge

.hgtags

doc/contributions.txt

indra/llcommon/llversionviewer.h

indra/llmath/CMakeLists.txt

indra/llmath/llcalc.cpp

indra/llmath/llcalc.h

indra/llmath/llcalcparser.cpp

indra/llmath/llcalcparser.h

indra/llmath/llvolume.cpp

indra/llmessage/tests/test_llsdmessage_peer.py

indra/llmessage/tests/testrunner.py

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llspinctrl.cpp

indra/newview/llappviewer.cpp

indra/newview/llassetuploadresponders.cpp

indra/newview/llassetuploadresponders.h

indra/newview/llfloaterdeleteenvpreset.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h