9fbee58 Merge remote-tracking branch 'origin/master' into f21

Merged and Committed by jwrdegoede 9 years ago
    Merge remote-tracking branch 'origin/master' into f21
    
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    
    Conflicts:
    	.gitignore
    	v4l-utils.spec
    
        
file modified
+1 -0
file modified
+12 -1