5a77ff Merge remote-tracking branch 'origin/users/jdelvare/master/for-next'

Merged and Committed by Jeff Mahoney 8 years ago
    Merge remote-tracking branch 'origin/users/jdelvare/master/for-next'
    
        
file modified
+1 -3
file modified
+1 -3
file modified
+2 -2
file modified
+1 -1
file modified
+2 -2
file modified
+4 -5
file modified
+5 -9
file modified
+4 -5
file modified
+4 -5
file modified
+3 -8
file modified
+3 -8
file modified
+3 -8
file modified
+3 -8
file modified
+3 -8
file modified
+3 -8
file modified
+2 -4
file modified
+2 -4
file modified
+4 -5
file modified
+4 -5
file modified
+4 -5