4342cbb Update to latest master to get testing on beta

Authored and Committed by bruno 10 years ago
    Update to latest master to get testing on beta
    
        
file modified
+1 -1
file modified
+5 -2