5ea8012 Merge branch 'master' into f17

Merged and Committed by oron 12 years ago
1 file changed. 2 lines added. 2 lines removed.
    Merge branch 'master' into f17
    
    Conflicts:
    	debconf.spec
    
        
file modified
+2 -2