[SCM] gmerlin/master: Override false-positive for spelling error

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f59e0bf3c44410836b08a991ed32c3de7fb9ff1c
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 18:08:33 2014 +0200

    Override false-positive for spelling error
    
    this time for real

diff --git a/debian/gmerlin.lintian-overrides b/debian/gmerlin.lintian-overrides
index b9e1066..007635a 100644
--- a/debian/gmerlin.lintian-overrides
+++ b/debian/gmerlin.lintian-overrides
@@ -1,2 +1,2 @@
 ## 'ang' is really a language-abbreviation, not a typo of 'and'
-gmerlin: spelling-error-in-manpage usr/share/man/man1/gmerlin-record.1.gz
+gmerlin: spelling-error-in-manpage usr/share/man/man1/gmerlin-record.1.gz ang and

-- 
gmerlin packaging