e455f75 Merge branch 'master' into el6

Merged and Committed by Petr Ĺ abata 9 years ago
    Merge branch 'master' into el6
    
        
file added
+61
file added
+30
file modified
+37 -10