2ab658 Merge branch 'packaging' into stable

Merged and Committed by Michal Marek 9 years ago
    Merge branch 'packaging' into stable
    
        
file modified
+26 -5