Merge branch 'PeterDing-youku'
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 15 Jun 2015 16:20:52 +0000 (00:20 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 15 Jun 2015 16:20:52 +0000 (00:20 +0800)

Trivial merge