9a7592d Merge branch 'master' into f20

Merged and Committed by cicku 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	zeitgeist.spec
    
        
file modified
+1 -0
file modified
+87 -53