4451ba1 Merge branch 'master' into el6

Merged and Committed by michich 13 years ago
    Merge branch 'master' into el6
    
    Update to 0.9.6.
    
    Conflicts:
    	.gitignore
    	icecream-rename-scheduler.patch
    	icecream.spec
    	sources
    
        
file modified
+1 -1
file modified
+12 -18
file modified
+9 -7
file modified
+1 -1