[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/b4d8c333
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b4d8c333
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b4d8c333

Branch: refs/heads/develop
Commit: b4d8c333688b57474decc601f01daa41e025f983
Parents: 732f456 ef38b46
Author: Sergio Fernández <wik...@apache.org>
Authored: Fri Oct 9 14:51:24 2015 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Fri Oct 9 14:51:24 2015 +0200

----------------------------------------------------------------------
 .../commons/http/MarmottaHttpUtils.java         |  4 +--
 .../commons/http/MarmottaHttpUtilsTest.java     | 27 ++++++++++++++++++++
 .../kiwi/sparql/builder/SQLBuilder.java         |  2 ++
 3 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------