[nepomuk-core/f19: 15/15] Merge branch 'master' into f19

[Rex Dieter]

commit 125292406854b1d011d887719104b3bb89401847
Merge: 45c1662 5a78d01
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 23:41:28 2013 -0500

    Merge branch 'master' into f19

 .gitignore        |    5 +--
 nepomuk-core.spec |   71 ++++++++++++++++++++++++++++++++++++++++++++---------
 sources           |    2 +-
 3 files changed, 62 insertions(+), 16 deletions(-)
---