diff options
| author | Paul Boddie <paul@boddie.org.uk> | 2014-08-06 17:48:26 +0200 |
|---|---|---|
| committer | Paul Boddie <paul@boddie.org.uk> | 2014-08-06 17:48:26 +0200 |
| commit | fee17e6f7a5fa995f7d77c7822e3ed1f2f8bffb5 (patch) | |
| tree | b401d3b6c748c09895ec4f0a887f3f2f0cdb6e0d /ext/python/Tools/freeze/checkextensions_win32.py | |
| parent | e0e89b980b8671eabf682cd83efc603775048228 (diff) | |
| parent | a8555e3e8789fd02b7d5749ea4fc51b84e57285f (diff) | |
| download | pykolab-dev/boddie.tar.gz | |
Merge branch 'master' of git://git.kolab.org/git/pykolab into dev/boddiedev/boddie
Conflicts:
conf/kolab.conf
po/POTFILES.in
pykolab/auth/ldap/__init__.py
pykolab/auth/ldap/cache.py
pykolab/cli/cmd_rename_mailbox.py
pykolab/imap/__init__.py
pykolab/imap/cyrus.py
pykolab/wap_client/__init__.py
pykolab/xml/event.py
Diffstat (limited to 'ext/python/Tools/freeze/checkextensions_win32.py')
0 files changed, 0 insertions, 0 deletions