f49ea89 merged with master for 1.2.1

Merged and Committed by Ionuț C. Arțăriși 13 years ago
    merged with master for 1.2.1
    
        
file modified
+1 -4
file modified
+7 -1
file modified
+1 -1