merge

doc/contributions.txt

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llqueuedthread.cpp

indra/llui/llaccordionctrl.cpp

indra/llui/llbutton.cpp

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/llnotifications.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/llui/lluictrl.cpp

indra/llui/lluictrlfactory.h

indra/llui/lluistring.cpp

indra/llui/llview.h

indra/llui/llviewquery.cpp

indra/llui/llviewquery.h

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagentlanguage.cpp