2013
Merge branch 'master' of github.com:yyzhuxin/iLib

Conflicts:
	iLib/iLib.sln
	iLib/iLib.v11.suo
i
Policy