Merge branch 'ss/corrupted-uidmap-file' into next

Conflicts: Changelog.draft.rst
2011-05-02 19:09:52 +02:00
parent cda932351c 2ed1c357a0
commit e9a7afda6d
2 changed files with 6 additions and 1 deletions
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@ -21,6 +21,7 @@ Changes
  slight speedup.
 * No whitespace is stripped from comma-separated arguments passed via
  the -f option.
+* Give more detailed error when encountering a corrupt UID mapping file.

 Bug Fixes
 ---------