automated merge

doc/contributions.txt

indra/llcommon/llchat.h

indra/llui/llflatlistview.cpp

indra/llui/llresizebar.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/CA.pem

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_solaris.txt

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llassetuploadresponders.cpp

indra/newview/llavataractions.cpp