Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/dev/developer/release.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/992dddf2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/992dddf2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/992dddf2
Branch: refs/heads/master
Commit: 992dddf2ba9a925d7e4a22d64ce88636a5c5dc30
Parents: 37d5b9f 6bac504
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 13 16:51:16 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 13 16:51:16 2016 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 4 +++-
gremlin-server/src/main/static/LICENSE | 22 +++++++++++-----------
2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
