Merge branch '6.0.x'

Author: sbrannen

spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java

@@ -200,7 +200,7 @@ public String getHost() {
 	 * Set the mail server port.
 	 * <p>Default is {@link #DEFAULT_PORT}, letting JavaMail use the default
 	 * SMTP port (25).
-	*/
+	 */
 	public void setPort(int port) {
 		this.port = port;
 	}