Merge branch 'tp32' into tp33
Conflicts:
gremlin-server/src/main/bin/gremlin-server.sh
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/88b6e143
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/88b6e
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/eb79f398
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb79f398
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eb
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/8005cb3e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8005cb3e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dd09c059
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dd09c059
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dd09c059
Br