[kactivities/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit f4531baf2c43e15f777ac00f6462adf2a19b485c
Merge: 0c267c4 ed492a2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:14:32 2013 -0500

    Merge branch 'master' into f19

 .gitignore                                   |    5 +-
 kactivities-4.10.2-drop_signal_handler.patch |   63 --------------------------
 kactivities.spec                             |   31 +++++++-----
 sources                                      |    2 +-
 4 files changed, 21 insertions(+), 80 deletions(-)
---