[dtv-scan-tables/f20: 4/4] Merge branch 'master' into f20

[Till Maas]

commit 9a8f2a2902c6b5873b1734c7139d023415c63ac3
Merge: b8f7898 92975bc
Author: Till Maas <opensource at till.name>
Date:   Sun Aug 31 18:55:55 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	dtv-scan-tables.spec
    	sources

 .gitignore           |    1 +
 dtv-scan-tables.spec |   10 ++++++++--
 sources              |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---