eb8a6c Merge remote branch 'origin/f12/master'

Merged and Committed by Adam Tkac 10 years ago
    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	appliance-tools.spec
    
    Signed-off-by: Adam Tkac <atkac@redhat.com>
    
        
file modified
+1 -1
file modified
+11 -4
file modified
+1 -1