Merge branch 'develop' v0.2.19
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Sep 2016 03:58:42 +0000 (23:58 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Sep 2016 03:58:42 +0000 (23:58 -0400)
commit85636ff1a015d04d3a8f960bc644b85ee5157135
tree69c2e3afe9dfea287448940a329ebc9d1b421dd9
parent12ab1804b6ebcd38b26960d65d254314d8bc33d6
parent821affb9a00f65d689055489c6672cadde40375b
Merge branch 'develop'