[5/9] marmotta git commit: Merge branch 'develop' into MARMOTTA-584

[wikier]

Merge branch 'develop' into MARMOTTA-584


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0b44731f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0b44731f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0b44731f

Branch: refs/heads/MARMOTTA-584
Commit: 0b44731fb986cb8296df85fac043dd6d9d77f1d5
Parents: 7a87c9d 8e97ffc
Author: Sergio Fernández <wik...@apache.org>
Authored: Mon Oct 12 11:59:21 2015 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Mon Oct 12 11:59:21 2015 +0200

----------------------------------------------------------------------
 .../marmotta-model-vocabs/pom.xml                |  2 +-
 .../reasoner/model/program/Justification.java    |  3 ++-
 .../test/engine/JustificationResolutionTest.java | 19 +++++--------------
 3 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------