79ee186 Merge branch 'master' into el6

Merged and Committed by Sam Kottler 10 years ago
    Merge branch 'master' into el6
    
    * master:
      Add patch for CVE-2014-2913 (BZ#1089879)
      Update to 2.15
    
        
file modified
+1 -0
file modified
+18 -5
file modified
+1 -1