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

[Rex Dieter]

commit 092c7ca71fbfc275f97efc2a3033eab98cbe859f
Merge: e932ea9 f297768
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:02:40 2014 -0500

    Merge branch 'master' into f20

 .gitignore        |    8 ++++-
 nepomuk-core.spec |   69 ++++++++++++++++++++++++++++++++++------------------
 sources           |    2 +-
 3 files changed, 52 insertions(+), 27 deletions(-)
---