[2/2] marmotta git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop

[wikier]

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into 
develop


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

Branch: refs/heads/develop
Commit: bfe5847255326338c49c80db23eb662649b15cdd
Parents: 01b2938 9779f36
Author: Sergio Fernández <wik...@apache.org>
Authored: Mon Apr 25 09:01:56 2016 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Mon Apr 25 09:01:56 2016 +0200

----------------------------------------------------------------------
 .../sparql/optimizer/NativeFilterOptimizer.java | 198 +++++++++++++++++++
 .../sparql/sail/KiWiSparqlSailConnection.java   |   5 +-
 .../sparql/test/ComplexKiWiSparqlQueryTest.java |  14 ++
 3 files changed, 215 insertions(+), 2 deletions(-)
----------------------------------------------------------------------