luohuazju/magic — pull request #7 by luohuazju (2013-09-25 22:36:50+00:00)
Title: Develop

Merge everything back to master