Merge branch 'develop' v0.2.18
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Apr 2016 19:29:19 +0000 (15:29 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Apr 2016 19:29:19 +0000 (15:29 -0400)
commit12ab1804b6ebcd38b26960d65d254314d8bc33d6
tree1eb52e96aa903c3d51f0ed26734321c17e92ef36
parenta71e8c82f6a9f73093b631e5deab1e8da716b61f
parent1e03a62b676ede721225e2137f35bb7d528498bc
Merge branch 'develop'