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

[Rex Dieter]

commit c74c6e18717d2490f0ede974ef211cac965209e3
Merge: 951cb12 2864b1d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:50:17 2014 -0500

    Merge branch 'master' into f20

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