[tnef/el5: 14/14] Merge branch 'master' into el5

[David Timms]

commit 3b77d84cf468ead38df53df757960ab14f44ef78
Merge: b961909 9c09b20
Author: David Timms <dtimms at iinet.net.au>
Date:   Sat Feb 21 23:14:14 2015 +1100

    Merge branch 'master' into el5
    
    Conflicts:
    	tnef.spec

 .gitignore          |   2 +-
 sources             |   2 +-
 tnef.spec           | 109 +++++++++++++++++++++++++++++++++++++++++++++++-----
 tnefextract.desktop |   1 -
 4 files changed, 102 insertions(+), 12 deletions(-)
---