Merge branch 'sceext2-fix-iqiyi-2015-07-17'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 18 Jul 2015 19:57:36 +0000 (03:57 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 18 Jul 2015 19:57:36 +0000 (03:57 +0800)

Trivial merge