Merge branch 'release-0.2.17' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sun, 20 Mar 2016 13:24:28 +0000 (09:24 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Sun, 20 Mar 2016 13:24:28 +0000 (09:24 -0400)
1  2 
Makefile.rule

diff --cc Makefile.rule
Simple merge