7c3a20b Update to upstream 1.0.4 release

Authored and Committed by Jared K. Smith 8 years ago
    Update to upstream 1.0.4 release
    
        
file modified
+2 -0
file modified
+51 -5
file modified
+6 -2
file modified
+2 -2