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)

Trivial merge