69734d0 Merge branch 'master' into f18

Merged and Committed by sailer 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	vfrnav.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+8 -1