Merged in lindenlab/viewer-release

indra/media_plugins/gstreamer010/CMakeLists.txt

indra/media_plugins/libvlc/CMakeLists.txt

indra/newview/CMakeLists.txt

indra/newview/Info-SecondLife.plist

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/installers/windows/installer_template.nsi

indra/newview/installers/windows/lang_da.nsi

indra/newview/installers/windows/lang_de.nsi

indra/newview/installers/windows/lang_en-us.nsi

indra/newview/installers/windows/lang_es.nsi

indra/newview/installers/windows/lang_fr.nsi

indra/newview/installers/windows/lang_it.nsi

indra/newview/installers/windows/lang_ja.nsi

indra/newview/installers/windows/lang_pl.nsi

indra/newview/installers/windows/lang_pt-br.nsi

indra/newview/installers/windows/lang_ru.nsi

indra/newview/installers/windows/lang_tr.nsi

indra/newview/installers/windows/lang_zh.nsi

indra/newview/installers/windows/language_menu.nsi