Merge branch 'ping-kuwo'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 16:11:41 +0000 (00:11 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 10 Jul 2015 16:11:41 +0000 (00:11 +0800)
commit901d00caa63eba1537f45701b919c9ae161ed59d
tree6bae2c8c78f376d88dbcce621309243a58b61c68
parent1c0163a5cc1d6b8fa5c7b4ee39b28e6e47c8981c
parent094790d2c963ef7ee9f5861e0458174ddd15ed87
Merge branch 'ping-kuwo'