Merge branch 'release-0.2.17' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:52:43 +0000 (20:52 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:52:43 +0000 (20:52 -0400)
commit2a5679da5f01cf57bed39a8d4a5e203617d33959
tree6d1252f801746504a9b56c01c39375ed44e2fe36
parent9b987badb069a95256f2627144645ce5c1f5a7d0
parenta71e8c82f6a9f73093b631e5deab1e8da716b61f
Merge branch 'release-0.2.17' into develop