Merge branch 'master' of github.com:keplerproject/luarocks into pref_versioned

Conflicts:
	src/luarocks/cfg.lua

1 files changed, 4 insertions, 1 deletions

diff --git a/win32/pe-parser.lua b/win32/pe-parser.lua
index 6b3a48c8..9cd36ffc 100644
--- a/win32/pe-parser.lua
+++ b/win32/pe-parser.lua
@@ -5,7 +5,7 @@
 -- case of 64 bit fields (bit/flag fields). Pointer arithmetic is still done numerically, so for
 -- very large files this could lead to undefined results. Use with care!
 --
--- Version 0.3, [copyright (c) 2013-2015 Thijs Schreijer](http://www.thijsschreijer.nl)
+-- Version 0.4, [copyright (c) 2013-2015 Thijs Schreijer](http://www.thijsschreijer.nl)
 -- @name pe-parser
 -- @class module
 
@@ -532,6 +532,9 @@ function M.msvcrt(infile)
           if not result then
             result = dll:match('(MSVCRTD?)%.DLL')
           end
+          if not result then
+            result = dll:match('(VCRUNTIME%d*D?)%.DLL')
+          end
     -- success, found it return name + binary where it was found
     if result then return result, infile end
   end