<p>Looks like upstream touched up my patch a bit. How do you usually update imaplib2?</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/OfflineIMAP/offlineimap/pull/222#issuecomment-146066447">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/AKFSEPVVjwwHbzT2M-hukPbyLaUa48QPks5o5IRwgaJpZM4FmicW.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/OfflineIMAP/offlineimap/pull/222#issuecomment-146066447"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>