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

[Rex Dieter]

commit fdfb6f961b03645b533f33aa80ae4529f4287285
Merge: 5195626 d4bca6b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:42:28 2014 -0500

    Merge branch 'master' into f20

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