Merge branch 'develop' v0.2.13
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:14:21 +0000 (23:14 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:14:21 +0000 (23:14 +0800)
commit51ce5ef447045a30573bd07e056d825f6cd299aa
tree059ce90d852290feb05101ca22e9196d32167798
parent37aee1f9b1dd16b5d27b63637deb2f40665ae059
parent1943ea91a877da8422ecda3a1929a42238a5f411
Merge branch 'develop'