[17/17] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62dc0338 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62dc0338 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62dc0338 Br

[17/17] tinkerpop git commit: Merge branch 'tp33'

Merge branch 'tp33' Conflicts: gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/23b766ad Tree: http://git-wi