Merge pull request #2377 from CtrlVP/master
authorCheng Zhao <zcbenz@gmail.com>
Thu, 30 Jul 2015 01:39:53 +0000 (09:39 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Thu, 30 Jul 2015 01:39:53 +0000 (09:39 +0800)
Replaced 'browser' with 'main'


Trivial merge