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)
commitb68356b9b92d0fa3d97db3a660bb477c43a34884
tree8b7a7fc51434dadea2d64618aa4f82f619432cd1
parent764a6e1d767bfbe51bcc00550159ce236f8c971b
parent2ded7497b693f4f2e02f57951de3050ac4ac8173
Merge pull request #2377 from CtrlVP/master

Replaced 'browser' with 'main'