[qfaxreader/el6: 17/17] Merge branch 'master' into el6

[wolfy]

commit 7e21dd65a4ee88f8106e9ea4c38209b87a241ae3
Merge: 8ade91d 742ba1c
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Wed Jun 11 01:27:21 2014 +0300

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 libtiff3.patch                      |    9 ++++
 qfaxreader-gcc4.3.0-configure.patch |   11 ----
 qfaxreader-parallel_build.patch     |   42 -----------------
 qfaxreader.spec                     |   88 +++++++++++++++++++++++++++++-----
 sources                             |    2 +-
 5 files changed, 85 insertions(+), 67 deletions(-)
---