322f71d update to 1.2-20150528

Authored and Committed by mlichvar 8 years ago
    update to 1.2-20150528
    
        
file modified
+1 -1
file modified
+5 -2
file modified
+1 -1