0b33941b59ef
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Thu, 19 Apr 2012 14:12:31 +0100 | 
| parents | f8b4a46387a4 (current diff) 8a238ba78698 (diff) | 
| children | 2c088480ba9e | 
| branches/tags | (none) | 
| files | offlineimaprc | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Thu, 19 Apr 2012 14:12:31 +0100 | 
| parents | f8b4a46387a4 (current diff) 8a238ba78698 (diff) | 
| children | 2c088480ba9e | 
| branches/tags | (none) | 
| files | offlineimaprc |