update
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
Merge branch 'master' of git://github.com/liutaihua/emotion-gallery
update
Merge branch 'master' of github.com:liutaihua/emotion-gallery