[38/50] [abbrv] git commit: Merge branch 'develop' into ldp

[jakob]

Merge branch 'develop' into ldp


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

Branch: refs/heads/develop
Commit: 1b4705bb6d5dfeeafb281d06f79e74f31c399733
Parents: b553735 de57f1f
Author: Sergio Fernández <wik...@apache.org>
Authored: Wed Mar 26 13:23:44 2014 +0100
Committer: Sergio Fernández <wik...@apache.org>
Committed: Wed Mar 26 13:23:44 2014 +0100

----------------------------------------------------------------------
 .../archetype-resources/src/test/java/services/MyServiceTest.java  | 2 +-
 .../src/test/java/webservices/MyWebServiceTest.java                | 2 +-
 .../marmotta/ldclient/test/freebase/TestFreebaseProvider.java      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------