Merge branch 'master' of git://github.com/monkey-j/RestSharp into monkey-g-patch-1

Michael Hallett · Michael Hallett · commit ed2fd1881418 · 2014-10-26T00:25:38.000-07:00
Conflicts:
	RestSharp/Deserializers/JsonDeserializer.cs
diff --git a/RestSharp/Deserializers/JsonDeserializer.cs b/RestSharp/Deserializers/JsonDeserializer.cs
@@ -149,8 +149,8 @@ private IList BuildList(Type type, object parent)
                 {
                     if (itemType.IsPrimitive)
                     {
-                        var value = element.ToString();
-                        list.Add(value.ChangeType(itemType, Culture));
+                        var item = ConvertValue(itemType, element);
+                        list.Add(item);
                     }
                     else if (itemType == typeof(string))
                     {

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,8 @@ private IList BuildList(Type type, object parent)`
`149`	`149`	`{`
`150`	`150`	`if (itemType.IsPrimitive)`
`151`	`151`	`{`
`152`		`- var value = element.ToString();`
`153`		`- list.Add(value.ChangeType(itemType, Culture));`
	`152`	`+ var item = ConvertValue(itemType, element);`
	`153`	`+ list.Add(item);`
`154`	`154`	`}`
`155`	`155`	`else if (itemType == typeof(string))`
`156`	`156`	`{`