Merge

doc/contributions.txt

indra/llcommon/llchat.h

indra/llui/llflatlistview.cpp

indra/llui/llresizebar.cpp

indra/llui/lltextbase.cpp

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/llui/llurlmatch.cpp

indra/llui/llurlmatch.h

indra/llui/llurlregistry.cpp

indra/llui/tests/llurlentry_stub.cpp

indra/llui/tests/llurlmatch_test.cpp

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/featuretable.txt