Cheng Zhao a4715f936b Merge branch 'master' into chrome31 ...

Conflicts:
	common/atom_version.h

2013-12-17 12:58:25 +08:00

..

native_type_conversions.h

Merge branch 'master' into chrome31

2013-12-17 12:58:25 +08:00

node_common.h

Include Environment declarations in node_common.h.

2013-12-16 14:46:05 +08:00

scoped_persistent.h

Huge commit to use new V8 and Content APIs.

2013-12-11 15:48:19 +08:00