Wenkai Yin 4ef5c1f98a Merge master into dev
Conflicts:
	.travis.yml
	Dockerfile.job
	vendor/vendor.json
2016-08-15 11:30:06 +08:00
..
2016-08-05 13:00:24 +08:00
2016-08-15 11:30:06 +08:00
2016-08-10 14:34:56 +08:00
2016-06-01 17:51:06 +08:00
2016-06-01 15:17:05 +08:00
2016-08-10 14:34:56 +08:00
2016-08-15 11:30:06 +08:00
2016-08-10 14:34:56 +08:00
2016-08-15 11:30:06 +08:00
2016-08-08 12:42:30 +08:00
2016-08-05 13:00:24 +08:00