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

[Rex Dieter]

commit 951cb12cbdd567f18e92073a1624bb9c5def1984
Merge: 8afe4c4 891db85
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 19:51:07 2014 -0500

    Merge branch 'master' into f20

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