Merge pull request #2316 from tengyifei/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 24 Jul 2015 03:11:56 +0000 (11:11 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 24 Jul 2015 03:11:56 +0000 (11:11 +0800)
commit9ec60cd585b726e578d06d5e8e090854a9fed3ec
treeb95f1477ff96b40483eaada936b4dafcec16de0a
parentde17894fce00e8afa0470f1aa2181319d89e8f81
parent8960aa956c669654c08c8a0727695ea81d1819e2
Merge pull request #2316 from tengyifei/master

Only allow extensions explicitly specified by the user. Fixes #2296