lichengyin 1ed41c91ce Merge branch 'master' into 2.1
* master:
  release 2.0.16
  add context for think.parseConfig

Conflicts:
	package.json
	src/adapter/cache/memcache.js
	src/adapter/cache/redis.js
2016-01-07 19:29:40 +08:00
..
2016-01-07 19:29:40 +08:00
2015-12-17 15:55:21 +08:00
2015-12-17 20:05:38 +08:00
2015-12-17 20:05:38 +08:00