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

[Rex Dieter]

commit f9f55a0b9bcf5dcd87d478afed6577780d2ad827
Merge: 722d50b e2deb9d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:27:10 2014 -0600

    Merge branch 'master' into f20

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