02a4a64 Merge branch 'master' into el6

Merged and Committed by praiskup 9 years ago
    Merge branch 'master' into el6
    
    Version: 0.10.2-3
    
        
file modified
+2 -3
file removed
-2
file modified
+59 -7