'Merging...'
Merge branch '2.1.0' of https://github.com/yellow1912/framework into 2.1.0
Merged
Merge branch '2.1.0' of git://github.com/vinhtrinh/framework into 2.1.0
merged with vinh