# This is a combination of 6 commits.
# The first commit's message is:
upgrade to nanv1.2

# The 2nd commit message will be skipped:

#	uv_async_cb declaration compat between 0.10 and 0.11

# The 3rd commit message will be skipped:

#	gc() doesnt set callback to NULL ffi_tests

# The 4th commit message will be skipped:

#	Update .travis.yml

# The 5th commit message will be skipped:

#	Update .travis.yml

# The 6th commit message will be skipped:

#	fix incorrect NAN usage
fix merge conflicts
using NanAsyncWorker for async calls
fix merge conflicts