54a246c Merge branch 'f14' into f13

Merged and Committed by Jon Ciesla 13 years ago
    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	childsplay.spec
    	sources
    
        
file modified
+2 -0
file removed
-33
file modified
+35 -6
file modified
+1 -1