Merge branch 'ping-yinyuetai'
authorYen Chi Hsuan <yan12125@gmail.com>
Wed, 8 Jul 2015 17:11:26 +0000 (01:11 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Wed, 8 Jul 2015 17:11:26 +0000 (01:11 +0800)

Trivial merge