Fix #686. Merge branch 'ashwinyes-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Nov 2015 20:30:26 +0000 (04:30 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Nov 2015 20:30:26 +0000 (04:30 +0800)
commite31948ceb0ffe0afcbed2e528cca3d4e1366c421
treeadcf7d411e524af5651bd6bd54357fbd42b029f7
parent4e4a3e783f49786a8cd5393ba58f2c87e0cfc8de
parent233ec2a1ccc358173df5e0231fca0c588ae15ddd
Fix #686. Merge branch 'ashwinyes-develop' into develop