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

[Lubomir Rintel]

commit e38c4ece47873f113e161c7e4ce5f46a5d3e47a6
Merge: 559e2c6 4635c80
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Tue Feb 25 18:23:42 2014 +0100

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

 .gitignore                                         |    1 +
 ...y-update-the-MIME-cache-when-DESTDIR-isnt.patch |   62 --------------------
 meld.spec                                          |   52 ++++++++++-------
 sources                                            |    2 +-
 4 files changed, 32 insertions(+), 85 deletions(-)
---