Merge branch 'jc/epochtime-wo-tz' into maint-2.3

diff --git a/Documentation/RelNotes/2.3.2.txt b/Documentation/RelNotes/2.3.2.txt
index f4caf5492776cdde3b7c562e08dd1566d5d6ed1f..93462e45c2e9cc25b0d789b43e213bf220996c7a 100644 (file)
--- a/Documentation/RelNotes/2.3.2.txt
+++ b/Documentation/RelNotes/2.3.2.txt
@@ -24,7 +24,7 @@ Fixes since v2.3.1
    "curl-config --vernum", which confused our build system.
 
  * An earlier workaround to squelch unhelpful deprecation warnings
-   from the complier on Mac OSX unnecessarily set minimum required
+   from the compiler on Mac OSX unnecessarily set minimum required
    version of the OS, which the user might want to raise (or lower)
    for other reasons.