Merge branch 'master' into typo

.gitignore

CMakeLists.txt

README.md

googlemock/CHANGES

googlemock/CMakeLists.txt

googlemock/include/gmock/gmock-actions.h

googlemock/include/gmock/gmock-generated-actions.h

googlemock/include/gmock/gmock-generated-actions.h.pump

googlemock/include/gmock/gmock-generated-function-mockers.h

...ock/include/gmock/gmock-generated-function-mockers.h.pump

googlemock/include/gmock/gmock-generated-matchers.h

googlemock/include/gmock/gmock-generated-matchers.h.pump

googlemock/include/gmock/gmock-matchers.h

googlemock/include/gmock/gmock-more-actions.h

...k/include/gmock/internal/gmock-generated-internal-utils.h

...lude/gmock/internal/gmock-generated-internal-utils.h.pump

googlemock/include/gmock/internal/gmock-internal-utils.h

googlemock/test/gmock-actions_test.cc

googlemock/test/gmock-generated-actions_test.cc

googlemock/test/gmock-generated-internal-utils_test.cc