Merge branch 'develop' v0.2.15
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 20:44:50 +0000 (15:44 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 20:44:50 +0000 (15:44 -0500)

Trivial merge