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

[Rex Dieter]

commit 54f786f03cef235a5e62f3f65880783e21463c71
Merge: 7572836 1c143ff
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 16:36:53 2014 -0500

    Merge branch 'master' into f20

 .gitignore        |    9 ++-------
 nepomuk-core.spec |   39 ++++++++++++++++++---------------------
 sources           |    2 +-
 3 files changed, 21 insertions(+), 29 deletions(-)
---