yanning
Merge branch 'master' of github.com:pning/code

Conflicts:
	send/sendweixin.py
	send/sendweixin.pyc