cf5b121 Merge branch 'master' into f13

Merged and Committed by Mads Villadsen 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	gnome-activity-journal.spec
    	sources
    
        
file modified
+1 -1
file modified
+18 -10
file modified
+1 -1