automated merge

doc/contributions.txt

indra/llcommon/llstring.h

indra/llui/lltextbase.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagentcamera.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventorymodel.cpp

indra/newview/llnamelistctrl.cpp

indra/newview/llnamelistctrl.h

indra/newview/llpaneleditwearable.cpp

indra/newview/llpaneleditwearable.h

indra/newview/llscrollingpanelparam.cpp

indra/newview/llscrollingpanelparam.h

indra/newview/llsidepanelappearance.cpp

indra/newview/llstatusbar.cpp

indra/newview/lltexturefetch.cpp

indra/newview/lltooldraganddrop.cpp

indra/newview/lltoolmorph.cpp