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

Branch: refs/heads/master
Commit: f171cc1f6abeab112c6bc1be8ad6aa2db8f9d8a2
Parents: 1b4705b 29c8849
Author: Sergio Fernández <wik...@apache.org>
Authored: Thu Mar 27 14:49:19 2014 +0100
Committer: Sergio Fernández <wik...@apache.org>
Committed: Thu Mar 27 14:49:19 2014 +0100

----------------------------------------------------------------------
 .../test/java/webservices/MyWebServiceTest.java |  19 +-
 .../marmotta-archetype-webapp/pom.xml           |  16 +
 .../main/resources/archetype-resources/pom.xml  |  13 +-
 .../src/test/resources/projects/basic/goal.txt  |   2 +-
 .../src/main/resources/META-INF/NOTICE          |   2 +-
 .../src/main/resources/installer/LICENSE.txt    | 232 ++++----
 .../src/main/webapp/META-INF/LICENSE            | 536 ++++++-------------
 .../src/main/webapp/META-INF/NOTICE             |   2 +-
 .../src/main/doc/LICENSE.txt                    | 157 ++++--
 .../src/main/resources/META-INF/LICENSE         | 356 ------------
 .../src/main/resources/META-INF/NOTICE          |  13 -
 .../src/main/resources/META-INF/NOTICE          |  11 -
 .../src/main/resources/META-INF/LICENSE         | 296 ----------
 .../src/main/resources/META-INF/NOTICE          |  11 -
 14 files changed, 456 insertions(+), 1210 deletions(-)
----------------------------------------------------------------------