71ba8ec Merge branch 'master' into f13

Merged and Committed by terjeros 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -0
file removed
-12
file modified
+4 -3
file modified
+1 -1