Wenkai Yin 039d94c13d Merge branch 'master' into sync_image
Conflicts:
	api/repository.go
2016-05-26 14:12:26 +08:00
..
2016-04-07 18:34:12 +08:00