Pull before compare branch hash.
Merge branch 'dev_20130905_simple_msg_solution' of D:\userdata\q19420\My Documents\我的坚果云\sync-repo\ufs_django_final into dev_20130905_simple_msg_solution