61b39dc Merge branch 'master' into f18

Merged and Committed by T.C. Hollingsworth 10 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	node-gyp.spec
    	sources
    
        
file modified
+1 -0
file modified
+38 -28
file modified
+6 -6
file modified
+1 -1