Merge branch 'master' into newlayout

@@ -181,6 +181,9 @@ typedef enum _ASINetworkErrorType {
 	NSStringEncoding responseEncoding;
 	NSStringEncoding responseEncoding;
 	
 	
 	BOOL allowResumeForFileDownloads;
 	BOOL allowResumeForFileDownloads;
+	
+	// Custom user information assosiated with the request
+	NSDictionary *userInfo;
 }
 }
 
 
 #pragma mark init / dealloc
 #pragma mark init / dealloc
@@ -342,4 +345,5 @@ typedef enum _ASINetworkErrorType {
 @property (assign) NSStringEncoding responseEncoding;
 @property (assign) NSStringEncoding responseEncoding;
 @property (assign) BOOL allowCompressedResponse;
 @property (assign) BOOL allowCompressedResponse;
 @property (assign) BOOL allowResumeForFileDownloads;
 @property (assign) BOOL allowResumeForFileDownloads;
+@property (retain) NSDictionary *userInfo;
 @end
 @end

@@ -90,6 +90,7 @@ static NSError *ASIUnableToCreateRequestError;
 	[self setDidFinishSelector:@selector(requestFinished:)];
 	[self setDidFinishSelector:@selector(requestFinished:)];
 	[self setDidFailSelector:@selector(requestFailed:)];
 	[self setDidFailSelector:@selector(requestFailed:)];
 	[self setDelegate:nil];
 	[self setDelegate:nil];
+	[self setUserInfo:nil];
 	url = [newURL retain];
 	url = [newURL retain];
 	cancelledLock = [[NSLock alloc] init];
 	cancelledLock = [[NSLock alloc] init];
 	return self;
 	return self;
@@ -1462,4 +1463,5 @@ static NSError *ASIUnableToCreateRequestError;
 @synthesize responseEncoding;
 @synthesize responseEncoding;
 @synthesize allowCompressedResponse;
 @synthesize allowCompressedResponse;
 @synthesize allowResumeForFileDownloads;
 @synthesize allowResumeForFileDownloads;
+@synthesize userInfo;
 @end
 @end