Merge remote-tracking branch 'refs/remotes/laullon/master'

Author: uhees

ApplicationController.m

@@ -66,10 +66,12 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
     [[SUUpdater sharedUpdater] setDelegate:self];
 
+    if ([PBGitDefaults useAskPasswd]) {
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
 	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
 	setenv( "DISPLAY", "localhost:0", 1 );
-
+    }
+       
 	[self registerServices];
 
     BOOL hasOpenedDocuments = NO;