{"head":"d073999a7d24fa07d1d0e547f1c3762b1895dedc","size":2,"push_id":45954183,"shas":[["133e19e3c14eb90de0c8481c01c42bb834015160","40ffc297681a477c0300f697475b30ba9d9d9524@mac.com","Merge branch 'develop' into feature/ARC\n\n* develop:\n  Logical & not &&. Dofus.\n  Added back the autoreleases (cost of maintaining ARC & non-ARC branches)\n  Turning off slash encoding by default. Can optionally turn it on with encoding options. Added unit test.\n  The self.tests and self.theConvertersByName is always nil in original codes, because [nil setByAddingObject] returns nil, [nil mutableCopy] return nil. That cause the customized convert function will not be invoked.\n  Fixes typo in doc. (Fixes #11)\n  Fixed bad error generator.\n  Added scanDataOfLength:intoPointer: less NSData = good.\n\nConflicts:\n\tSource/Experimental/CFilteringJSONSerializer.m\n\tSource/JSON/CJSONScanner.m","Jonathan Wight"],["d073999a7d24fa07d1d0e547f1c3762b1895dedc","40ffc297681a477c0300f697475b30ba9d9d9524@mac.com","Removed bogus code that snuck in after merge.","Jonathan Wight"]],"ref":"refs/heads/feature/ARC"}