Merge branch 'master' of git://repo.or.cz/TortoiseGit

Conflicts:
	ext/gitexe/igit.exe
	src/TGitCache/TSVNCache.vcproj

diff --cc src/TGitCache/TSVNCache.vcproj
index c34fec5,b0a7b04..fca03c7
--- 1/src/TGitCache/TSVNCache.vcproj
--- 2/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@@ -575,4 -575,4 +575,4 @@@
        </Files>\r
        <Globals>\r
        </Globals>\r
--</VisualStudioProject>\r
++</VisualStudioProject>

diff --cc src/TortoiseGit.sln
index bf757c1,5257ba3..dafdd0e
--- 1/src/TortoiseGit.sln
--- 2/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@@ -345,8 -344,8 +344,7 @@@ Globa
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|Win32.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x64.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64\r
 -              {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.Build.0 = Release|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x64.ActiveCfg = Debug|Win32\r