ce709c8 Merge branch 'master' into f17

Merged and Committed by madko 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	glances.spec
    
        
file modified
+1 -0
file modified
+19 -0
file modified
+1 -1