Merge commit 'fml/master'

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 4205c3f53294ac80091864d3d459c29e4207b233..29bce100380c44e63841c56aff734107f9b324f8 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -163,7 +163,7 @@ dependon="no_default_filters"
 details="
        This option may be given multiple times. The \"filter_spec\"
        consists of an audio format, the name of the filter, and any
-       options for that filter. Mote that order matters.
+       options for that filter. Note that order matters.
 
        Examples: