Merge

.hgtags

BuildParams

autobuild.xml

doc/contributions.txt

indra/llcommon/llversionviewer.h

indra/llmessage/lliosocket.cpp

indra/llmessage/lliosocket.h

indra/llui/llconsole.cpp

indra/llvfs/CMakeLists.txt

indra/llvfs/lldiriterator.cpp

indra/llvfs/tests/lldiriterator_test.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavataractions.cpp

indra/newview/llbottomtray.cpp

indra/newview/lldebugview.cpp

indra/newview/llfloaterauction.cpp

indra/newview/llfloatersellland.cpp

indra/newview/llfloatertools.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/lllogchat.cpp