tree e4ef5bcbffc1f6e0380916aa81aa01748c6cc4e6
parent eb0e23e44c451d0e7ea92d881eb8c82f4aa86481
parent 95e05ba789d0b0aebd51c886afee0c5b3dddda63
author Anis Kadri <anis@apache.org> 1462559612 -0700
committer Anis Kadri <anis@apache.org> 1462559612 -0700

Merge branch 'vladimir-kotikov-node6_fix'