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

[Rex Dieter]

commit 2ce6158013fed10987e8d8b201e80e3a17bdaed3
Merge: 26557d7 68a72af
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 22:50:55 2014 -0500

    Merge branch 'master' into f20

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