diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2013-06-23 13:04:30 +0200 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2013-06-23 13:04:30 +0200 |
| commit | 75cc8a9998d32e714a05760e968e38b71c2ac157 (patch) | |
| tree | a7fb707901b00d992fbc915849521dd5964e64de /dedup/arreader.py | |
| parent | 523fb675368d180ab9c5a16b6f48a4d29693c8ae (diff) | |
| parent | f2bd48d342518c11ec7deaeee5b437ac524514de (diff) | |
| download | debian-dedup-75cc8a9998d32e714a05760e968e38b71c2ac157.tar.gz | |
Merge master into sqlalchemy
This is necessary to avoid severe merge conflicts when converting
importpkg.py to sqlalchemy. The actual sql invocation has moved to a
different file in master.
Conflicts:
README (diverged set of dependencies)
Diffstat (limited to 'dedup/arreader.py')
0 files changed, 0 insertions, 0 deletions