60caae8 - merge latest from upstream

Authored and Committed by james 15 years ago
    - merge latest from upstream
    - move to 6hr metadata
    
        
file modified
+1170 -597
file modified
+8 -1