Merge pull request #3282 from bureken/master
authorCheng Zhao <zcbenz@gmail.com>
Mon, 2 Nov 2015 10:33:27 +0000 (18:33 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 2 Nov 2015 10:33:27 +0000 (18:33 +0800)
Replace Mac with OS X


Trivial merge