[nepomuk-widgets/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 89c86b3f45cc54a7c6ae4b33bcce0921532d976f
Merge: c74c6e1 75fc7ec
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:39:05 2014 -0500

    Merge branch 'master' into f20

 .gitignore           |    3 +++
 nepomuk-widgets.spec |   14 +++++++++++++-
 sources              |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---