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

[Rex Dieter]

commit 5195626d28876254a6b4f191f97df85149af40ae
Merge: 5471c02 9f4d968
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 23:09:34 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    6 ++++++
 kopete.spec |   28 ++++++++++++++++++++++++++--
 sources     |    2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
---