merge

doc/contributions.txt

indra/llcommon/llinstancetracker.h

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/lldockablefloater.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/llui/lltabcontainer.cpp

indra/llui/lltoolbar.cpp

indra/llui/lltoolbar.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llxuixml/llinitparam.h

indra/llxuixml/llxuiparser.cpp

indra/newview/app_settings/commands.xml

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/settings.xml