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

[Rex Dieter]

commit 26557d71bf915acc67f615cb0f1449cf0197e3bf
Merge: 833283c 3f386cc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:19:19 2014 -0500

    Merge branch 'master' into f20

 .gitignore       |    4 +-
 kactivities.spec |  116 ++++++++++++++++++++++++++++++++++++++++++++++--------
 sources          |    2 +-
 3 files changed, 102 insertions(+), 20 deletions(-)
---