Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

indra/cmake/LLBase.cmake

indra/cmake/Requests.cmake

indra/llvfs/lldir_mac.cpp

indra/llwindow/llwindowmacosx.cpp

indra/newview/CMakeLists.txt

indra/newview/Info-SecondLife.plist

indra/newview/installers/windows/installer_template.nsi

indra/newview/llappviewer.cpp

indra/newview/llstartup.cpp

indra/newview/llvoicevivox.cpp

indra/newview/viewer_manifest.py