I os con cn2012#2

Open

ThrowDice wants to merge 3 commits intopyhunterpig:masterfrom

ThrowDice:iOSConCN2012

Commits on Feb 28, 2012

Commit Yitao Yang's changes
ThrowDice
committed

Commits on Mar 1, 2012

first commit for iOSCon2012
ThrowDice
committed

Commits on Mar 2, 2012

See Changelog
ThrowDice
committed