Merge branch 'ping-vlive'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 5 Sep 2015 07:35:19 +0000 (15:35 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 5 Sep 2015 07:35:19 +0000 (15:35 +0800)

Trivial merge