[kopete/f20: 6/6] Merge branch 'master' into f20

[Rex Dieter]

commit d8b09f193d3ec452c002cdf6f54ff21cc580bce3
Merge: fdfb6f9 f096a11
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:27:36 2014 -0500

    Merge branch 'master' into f20

 .gitignore                                         |   21 ++-----------------
 ..._iris.patch => kopete-4.13.97-system_iris.patch |   17 ++++++++-------
 kopete.spec                                        |   18 ++++++++++++++--
 sources                                            |    2 +-
 4 files changed, 28 insertions(+), 30 deletions(-)
---