Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c3d897a9 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c3d897a9 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c3d897a9 Branch: refs/heads/develop Commit: c3d897a95245d5fcf983e42239ea3506dae0bfb3 Parents: c8616cf 6346d31 Author: Sebastian Schaffert <[email protected]> Authored: Fri Nov 22 12:57:13 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Nov 22 12:57:13 2013 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
