Merge changes

.hgignore

indra/lib/python/indra/util/llversion.py

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llmessage/llcachename.cpp

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/res/viewerRes.rc

indra/newview/skins/default/xui/da/floater_bulk_perms.xml

indra/newview/skins/default/xui/da/floater_font_test.xml

indra/newview/skins/default/xui/da/floater_perm_prefs.xml

indra/newview/skins/default/xui/da/floater_statistics.xml

indra/newview/skins/default/xui/da/menu_mini_map.xml

indra/newview/skins/default/xui/en/widgets/filter_editor.xml

indra/newview/skins/default/xui/en/widgets/list_view.xml

indra/newview/skins/default/xui/en/widgets/split_button.xml

indra/newview/viewer_manifest.py

scripts/update_version_files.py