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

[Rex Dieter]

commit f89404417e5f3ee123c82cb35b2565d852bf4b36
Merge: 17495b6 7ada56e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:16:55 2014 -0600

    Merge branch 'master' into f20

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