merge

.hgignore

.hgtags

doc/contributions.txt

indra/linux_crash_logger/llcrashloggerlinux.cpp

indra/linux_crash_logger/llcrashloggerlinux.h

indra/llcrashlogger/llcrashlogger.cpp

indra/llcrashlogger/llcrashlogger.h

indra/llmessage/llcurl.h

indra/llui/llkeywords.cpp

indra/llui/llkeywords.h

indra/mac_crash_logger/llcrashloggermac.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/featuretable.txt

indra/newview/installers/windows/lang_ru.nsi

indra/newview/installers/windows/lang_tr.nsi

indra/newview/llappviewer.cpp

indra/newview/llfloaterabout.cpp