[cabextract/el5: 26/26] Merge branch 'el6' into el5

[Juan Orti]

commit 2493820162887839a3f31eb11839508e4509b9ca
Merge: 8bd0006 4b0be57
Author: Juan Orti Alcaine <juan.orti at miceliux.com>
Date:   Mon Mar 23 09:34:41 2015 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	cabextract.spec
    	sources

 .gitignore      |  3 ++-
 cabextract.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 sources         |  2 +-
 3 files changed, 56 insertions(+), 5 deletions(-)
---