[antiword/el5: 18/18] Merge branch 'master' into el5

[Adrian Reber]

commit 579b477572309cbcbabadf6c7b0c447b78304def
Merge: d31a27d 6d3ae14
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Dec 2 14:08:16 2014 +0100

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

 antiword-0.32-fix-flags.patch                      |    2 +-
 ...event-buffer-overflow-of-atPPSlist-_szName.diff |   28 +++++++++++
 antiword.sh                                        |   11 ++++
 antiword.spec                                      |   52 ++++++++++++++++++--
 4 files changed, 87 insertions(+), 6 deletions(-)
---