[nepomuk-widgets/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit ab746fb3e5bbeed4e1f35819b1c5d7d9ce9b306b
Merge: 9832f2e e3ae43a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:35:00 2013 -0500

    Merge branch 'master' into f19

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