Merge

.hgtags

BuildParams

autobuild.xml

build.sh

doc/contributions.txt

indra/cmake/LLAddBuildTest.cmake

indra/llcommon/llversionviewer.h

indra/llimage/llimagedimensionsinfo.cpp

indra/llimage/llimagedimensionsinfo.h

indra/llmessage/llurlrequest.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/lliconctrl.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llmenugl.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/CA.pem