tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ns/init-remove-uneeded-import' into next

Browse Source 
Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht 2011-01-28 19:53:23 +01:00
commit 5660bacc5b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.draft.rst
View File

@ -17,12 +17,12 @@ Changes
------- -------
* have --version ONLY print the version number * have --version ONLY print the version number
* Code cleanups.
Bug Fixes Bug Fixes
--------- ---------
* Makefile: docutils: work whether python extension is stripped or not * Makefile: docutils: work whether python extension is stripped or not
* accord __version__ with import
Pending for the next major release Pending for the next major release

1
offlineimap/init.py
View File

@ -27,7 +27,6 @@ from optparse import OptionParser
import offlineimap import offlineimap
from offlineimap import accounts, threadutil, syncmaster from offlineimap import accounts, threadutil, syncmaster
from offlineimap.ui import UI_LIST, setglobalui, getglobalui from offlineimap.ui import UI_LIST, setglobalui, getglobalui
from offlineimap.localeval import LocalEval
from offlineimap.CustomConfig import CustomConfigParser from offlineimap.CustomConfig import CustomConfigParser