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/600c2638 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/600c2638 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/600c2638 Branch: refs/heads/ldp Commit: 600c263852862d0531cc3b6e506f719683529745 Parents: 555ea12 05d19ce Author: tkurz <[email protected]> Authored: Thu Mar 20 15:07:02 2014 +0100 Committer: tkurz <[email protected]> Committed: Thu Mar 20 15:07:02 2014 +0100 ---------------------------------------------------------------------- .../marmotta-archetype-module/pom.xml | 10 +++ .../marmotta-archetype-webapp/pom.xml | 70 ++++++++++++++++++++ 2 files changed, 80 insertions(+) ----------------------------------------------------------------------
