[2/5] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: docs/src/tutorials/getting-started/index.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/66099fed Tree:

[2/5] 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/ef2cd572 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef2cd572 Diff:

[2/5] 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

[2/5] 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

[2/5] 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/31199000 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31199000 Diff: