[meld/epel7: 14/14] Merge branch 'master' into epel7

[Lubomir Rintel]

commit 6667547e50ff5efcc0ae8fa7d4c180c871e3d748
Merge: 6acc166 b49539e
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Fri Feb 20 16:38:32 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	meld.spec
    	sources

 .gitignore                                         |  7 +++
 ...-helper-to-get-the-current-MeldWindow-and.patch | 49 ----------------
 ...minate-with-proper-exit-status-upon-error.patch | 47 ---------------
 meld.spec                                          | 68 +++++++++++++++-------
 sources                                            |  2 +-
 5 files changed, 55 insertions(+), 118 deletions(-)
---