Merge branch '3.1.x'

* 3.1.x:
  [ticket/13976] Fix comment typo in salted_md5.php

phpBB/phpbb/passwords/driver/salted_md5.php

@@ -75,7 +75,7 @@ class salted_md5 extends base
 				// happen if pre-determined settings are
 				// directly passed to the driver. The manager
 				// will not do this. Same as the old hashing
-				// implementatio in phpBB 3.0
+				// implementation in phpBB 3.0
 				return md5($password);
 			}
 		}