d
Merge branch 'master' of https://github.com/SimonneX/weiboSDK_demo

Conflicts:
	weiboSDK_demo/class/weiboViewController.h
	weiboSDK_demo/class/weiboViewController.m