[4/9] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f085146 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f085146 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f

[4/9] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: giraph-gremlin/pom.xml gremlin-archetype/gremlin-archetype-dsl/pom.xml gremlin-archetype/gremlin-archetype-server/pom.xml gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml gremlin-archetype/pom.xml greml