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)
commit9e535ce055c9b57b6c7fa3c51c6a0928dae2b56d
treefae1fa988e1993e135868b1817551825d528e42e
parent9281f6d25338c179e7bc2f48352da3311102158e
parentd76dea001b5365b7646986cba12f9908cd321f6a
Merge branch 'ping-yinyuetai'