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)

Trivial merge