Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo

Conflicts:
	src/google/protobuf/compiler/java/java_file.cc

1 files changed, 2 insertions, 2 deletions

diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index b7ea756c..0e9d88a8 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -1348,7 +1348,7 @@ class LIBPROTOBUF_EXPORT DescriptorPool {
     };
 
     // Reports an error in the FileDescriptorProto. Use this function if the
-    // problem occured should interrupt building the FileDescriptorProto.
+    // problem occurred should interrupt building the FileDescriptorProto.
     virtual void AddError(
       const string& filename,      // File name in which the error occurred.
       const string& element_name,  // Full name of the erroneous element.
@@ -1358,7 +1358,7 @@ class LIBPROTOBUF_EXPORT DescriptorPool {
       ) = 0;
 
     // Reports a warning in the FileDescriptorProto. Use this function if the
-    // problem occured should NOT interrupt building the FileDescriptorProto.
+    // problem occurred should NOT interrupt building the FileDescriptorProto.
     virtual void AddWarning(
       const string& /*filename*/,      // File name in which the error occurred.
       const string& /*element_name*/,  // Full name of the erroneous element.