[cabextract/el6: 9/9] Merge branch 'master' into el6

[Juan Orti]

commit 4b0be5733a765ed07e6e8c8148d3fb7234e56045
Merge: 5aeddd0 13e1c43
Author: Juan Orti Alcaine <juan.orti at miceliux.com>
Date:   Sun Mar 1 10:15:39 2015 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

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