e3105a0 Merge remote-tracking branch 'origin/master' into f18

Merged and Committed by elad 11 years ago
    Merge remote-tracking branch 'origin/master' into f18
    
    Conflicts:
    	.gitignore
    	gnome-documents.spec
    	sources
    
        
file modified
+1 -0
file modified
+6 -4
file modified
+1 -1