svn merge -r 56262:56561 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1

Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.

indra/newview/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.13.1.6";
-CFBundleGetInfoString = "Second Life version 1.13.1.6, Copyright 2004-2006 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.13.1.7";
+CFBundleGetInfoString = "Second Life version 1.13.1.7, Copyright 2004-2006 Linden Research, Inc.";

indra/newview/Info-SecondLife.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.13.1.6</string>
+	<string>1.13.1.7</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>