Merge branch 'develop' v0.2.15
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 20:44:50 +0000 (15:44 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 27 Oct 2015 20:44:50 +0000 (15:44 -0500)
commit53e849f4fcae4363a64576de00e982722c7304f9
treedc0ac9c1d0310a755ba846e3f946718f99f06d8b
parentd0c51c4de91b2356b770f92862c6b0e1d54953cd
parent8447498b504a3a903507715b3144e8b2a05ec0a0
Merge branch 'develop'