Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ac382c5a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ac382c5a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ac382c5a
Branch: refs/heads/master
Commit: ac382c5a93d0d599be2f560cc2361f722b7ead23
Parents: 744852b ddefa3f
Author: Stephen Mallette <[email protected]>
Authored: Tue Jul 26 11:25:24 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Jul 26 11:25:24 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
