Merge branch 'remitamine-baidu'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 2 Jan 2016 13:50:17 +0000 (21:50 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 2 Jan 2016 13:50:17 +0000 (21:50 +0800)

Trivial merge