Merge branch 'master' into 0.9

This commit is contained in:
Blake Watters
2011-03-28 23:33:53 -04:00

View File

@@ -172,7 +172,7 @@ static const NSString* kRKModelMapperRailsDateFormatString = @"MM/dd/yyyy";
return;
} else {
[NSException raise:@"Unable to map from requested string"
format:@"The object was serialized into a %@. A dictionary of elements was expected.", [object class]];
format:@"The object was serialized into a %@. A dictionary of elements was expected. (Object: %@) [Payload: %@]", [object class], object, string];
}
}