Merge branch 'develop' v0.2.14
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 24 Mar 2015 20:07:07 +0000 (15:07 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 24 Mar 2015 20:07:07 +0000 (15:07 -0500)
commitd0c51c4de91b2356b770f92862c6b0e1d54953cd
treec904641055e1e76a4f8b0ebf9e9e7fe71ca83933
parent51ce5ef447045a30573bd07e056d825f6cd299aa
parenta3491e1e88e0f6a8a09188825048a66ef07ad80f
Merge branch 'develop'