{"shas":[["63d4865351eabace94ea50ebb0389e17a8d08c25","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","Merge branch '1.1-branch' into chrism-py3-alt-merge2\n\nConflicts:\n\t.gitignore\n\twebob/etag.py\n\twebob/request.py","Sergey Schetinin"],["3aeaae0f26c4dd68766ee9186c502bbeeca44ca8","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","Merge commit '250a1f802668378c69a751194aba19899b456f25' into chrism-py3-alt-merge2\n\nConflicts:\n\ttests/test_misc.py\n\ttests/test_request.py\n\ttests/test_response.py\n\ttox.ini\n\twebob/request.py\n\twebob/response.py","Sergey Schetinin"],["224ac150ab229ef6694650463366295c7c4c85bf","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","Merge commit 'bce343c65d61d2b0ff67b86fa7cee0f59f3bd288' into chrism-py3-alt-merge2\n\nConflicts:\n\ttests/test_in_wsgiref.py\n\ttests/test_response.py\n\twebob/request.py\n\twebob/response.py","Sergey Schetinin"],["3cbe6867a844fc57f15b3da911f624a03c14643f","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","fix unresolved conflicts","Sergey Schetinin"],["d633a67005ced94a2dd42de6d0959c6c38c6ca2f","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","fix the FakeCGIBody / _encode_multipart that lost some of the code during rewrite + merge","Sergey Schetinin"],["86c7200b7d0c4a814e82f01cb2d6c0635c10ff84","1559339698d4b91062141e6c67af7c94ca1d6f09@plope.com","b -> bytes_\nu -> text_\n\nUse b'' literals instead of calls to b()","Chris McDonough"],["7c3adc1be442068743aa246f5bdc05d75c92a835","1559339698d4b91062141e6c67af7c94ca1d6f09@plope.com","atrocious straddling code","Chris McDonough"],["22ba50f46ddb461ae07aa88adb313327bc74968f","cfe74ffce19725b649a58c767cf804fa2e18ef54@maluke.com","Merge remote-tracking branch 'origin/master' into chrism-py3-alt-merge","Sergey Schetinin"]],"ref":"refs/heads/master","size":8,"head":"22ba50f46ddb461ae07aa88adb313327bc74968f","push_id":43316178}