Merge tag 'v6.7.0.3' into next

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
2016-07-26 08:47:11 +02:00 · 2016-07-26 08:47:11 +02:00 · 2f060aa269
parent 05e5b9c6bb ecef22a16c
commit 2f060aa269
2 changed files with 9 additions and 0 deletions
--- a/Changelog.maint.md
+++ b/Changelog.maint.md
@ -15,6 +15,13 @@ This is the Changelog of the maintenance branch.
 	If anyone volunteers to maintain it and backport patches, let us know!


+### OfflineIMAP v6.7.0.3 (2016-07-26)
+
+#### Bug Fixes
+
+* sqlite: properly serialize operations on the database files
+
+
 ### OfflineIMAP v6.7.0.2 (2016-07-22)

 #### Bug Fixes
--- a/offlineimap/folder/LocalStatusSQLite.py
+++ b/offlineimap/folder/LocalStatusSQLite.py
@ -22,6 +22,8 @@ from threading import Lock

 import six

+import six
+
 from .Base import BaseFolder

 class DatabaseFileLock(object):