Merge branch 'develop' v0.2.10.rc1
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:46:22 +0000 (10:46 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 29 Jun 2014 02:46:22 +0000 (10:46 +0800)

Trivial merge