Merge

.hgtags

BuildParams

doc/contributions.txt

indra/cmake/FindLLQtWebkit.cmake

indra/llcommon/llversionviewer.h

indra/llprimitive/lltextureentry.cpp

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/llcommandhandler.cpp

indra/newview/llhudeffectblob.cpp

indra/newview/llstartup.cpp

indra/newview/lltexturecache.cpp

indra/newview/lltoolpie.cpp

indra/newview/lltoolpie.h

indra/newview/llviewermessage.cpp

indra/newview/llviewerobjectlist.cpp

.../newview/skins/minimal/xui/en/notification_visibility.xml

indra/newview/skins/minimal/xui/en/notifications.xml

indra/newview/viewer_manifest.py