tree be705d5bc459efdbbdfc3c83a8afcd58274c7d70
parent 3d7ddb555aa668124a2aaca8b76f187ef4ebb38c
parent d38b37056122c6ea1eb12639f225ed21ae89b111
author Jinjiang <zhaojinjiang@me.com> 1467016389 +0800
committer Jinjiang <zhaojinjiang@me.com> 1467016562 +0800

Merge branch 'master' into weex-loader-es6