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

[Rex Dieter]

commit 24d5c2a00126121a5b7cbc2b9bfc6a8d093bcda2
Merge: 092c7ca fb15273
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 22:50:33 2014 -0500

    Merge branch 'master' into f20

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