Merge branch 'master' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 15 Dec 2012 14:49:37 +0000 (22:49 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 15 Dec 2012 14:49:37 +0000 (22:49 +0800)
commitfba6b590f2f9068bb376a21597df40ef8ac26305
treef7d2a8ae8570154b297c8743e8a2810865d25eec
parentbdf8d9411e2e3698c7462a46e813c148c0e8aa98
parent97f68f7f3abd7d9137e68bb699675563909f73a5
Merge branch 'master' into develop