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

[Rex Dieter]

commit 17495b61d4e975a4bf494718c369fb0875b78860
Merge: d8b09f1 ba7d7ed
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:16:40 2014 -0500

    Merge branch 'master' into f20

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