c4b88d9 Merge branch 'master' of ssh://pkgs.fedoraproject.org/bibletime

Merged and Committed by greghellings 9 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bibletime
    
    Conflicts:
    	bibletime.spec
    
        
file modified
+9 -0