Merge branch 'release-0.2.17'
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:44:01 +0000 (20:44 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:44:01 +0000 (20:44 -0400)
commit1619b2f3c835e9a2aff2c7ad4bb5757dade9488c
treecd86b552d7d07a5feefc8f05b4a1ce0d57d5970b
parentfced5744fbda3d9c6ca524b840330ebbbad7e373
parent4f3153395a82b7076ccf63db48161b714dc8a7ca
Merge branch 'release-0.2.17'