Fix #108
Merge pull request #1101 from jbialobr/upstream

Fix #108.
Merge branch 'pr/n1093_j-a-b'
Merge branch 'pr/n1073_Nehle'
-n seconds ago fixed. Closes #1089
HandleMergeConflicts doesn't offer commit for CherryPick and ReverCommit forms if AutoCommit disabled

* Regex for spell checker fixed
Crash with wrong encoding in .gitconfig file fixed. Closes #1108
Merge remote-tracking branch 'origin/master' into dotNet4

Conflicts:
	GitCommands/Git/GitCommandHelpers.cs
	GitCommands/System.cs
	GitUI/FormApplyPatch.cs
	GitUI/FormBrowse.cs
	GitUI/FormCherryPickCommitSmall.cs
	GitUI/FormFileHistory.Designer.cs
	GitUI/FormFileHistory.cs
	GitUI/FormRevertCommitSmall.cs
	GitUI/RevisionGrid.cs
Added Gerrit plugin to installer
Merge branch 'master' into dotNet4
Adding keyboard shortcut for File > File Explorer menu item.
Updated msysgit to version 1.7.11
Merge branch 'master' into dotNet4
Merge remote-tracking branch 'mdonatas/open_repo_dir_shortcut'
Add Gerrit Plugin to the VS 2012 Solution

 - This fixes a build failure in the VS2012 installer build script.
FileEditor error code fixed. Closes #1081
Notepad++ path fixed
Merge pull request #1110 from DanRigby/master

Add Gerrit Plugin to the VS 2012 Solution
Rewrited path detection for Git, Putty and Linux Sh command. Closes #1104
Commit per user statistic now include information for submodules