[tinkerpop] 01/01: Merge branch 'tp33'

[spmallette]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 4c767c8d09d7d89c392e3ecf96d1f25e3aa5c7d9
Merge: 07e20bf 437b0f6
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jan 2 16:44:04 2019 -0500

    Merge branch 'tp33'

 CHANGELOG.asciidoc                      | 2 +-
 docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)