Merge pull request #3179 from bjwatson/fix-duration-typo

Fix typos in comment

python/google/protobuf/json_format.py

@@ -532,8 +532,8 @@ class _Parser(object):
 
   def _ConvertGenericMessage(self, value, message):
     """Convert a JSON representation into message with FromJsonString."""
-    # Durantion, Timestamp, FieldMask have FromJsonString method to do the
+    # Duration, Timestamp, FieldMask have a FromJsonString method to do the
-    # convert. Users can also call the method directly.
+    # conversion. Users can also call the method directly.
     message.FromJsonString(value)
 
   def _ConvertValueMessage(self, value, message):