From 8c7a7355a31ce16b6d05eba6a2d0b416ff224345 Mon Sep 17 00:00:00 2001
From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Date: Thu, 10 Mar 2016 17:08:18 +0100
Subject: [PATCH] v6.7.0

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
---
 Changelog.md            | 72 +++++++++++++++++++++++++++++++++++++++++
 offlineimap/__init__.py |  3 +-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2ac31b3..8d49115 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,78 @@ Note to mainainers:
 * The following excerpt is only usefull when rendered in the website.
 {:toc}
 
+### OfflineIMAP v6.7.0 (2016-03-10)
+
+#### Notes
+
+New stable release out!
+
+With the work of Ilias, maintainer at Debian, OfflineIMAP is learning a new CLI
+option to help fixing filenames for the users using nametrans and updating from
+versions prior to v6.3.5.  Distribution maintainers might want to backport this
+feature for their packaged versions out after v6.3.5. Have a look at commit
+c84d23b65670f to know more.
+
+OfflineIMAP earns the slogan "Get the emails where you need them", authored by
+Norbert Preining.
+
+Julien Danjou, the author of the book _The Hacker’s Guide To Python_, shared us
+his screenshot of a running session of OfflineIMAP.
+
+I recently created rooms for chat sessions at Gitter. It appears to be really
+cool, supports seamless authentication with a github account, persistent logs,
+desktop/mobile clients and many more usefull features. Join us at Gitter!
+
+- https://gitter.im/OfflineIMAP/offlineimap  [NEW]
+- https://gitter.im/OfflineIMAP/imapfw       [NEW]
+
+Now, the OfflineIMAP community has 2 official websites:
+
+- http://www.offlineimap.org (for offlineimap)
+- http://imapfw.offlineimap.org (for imapfw) [NEW]
+
+The Twitter account was resurrected, too. Feel free to join us:
+
+  https://twitter.com/OfflineIMAP
+
+Finally, the teams of the OfflineIMAP organization at Github were renewed to
+facilitate the integration of new contributors and directly improve both the
+documentation and the websites.
+
+As a side note, the [imapfw repository](https://github.com/OfflineIMAP/imapfw)
+has now more than 50 stargazers. This is very encouraging.
+
+Thank you much everybody for your various contributions into OfflineIMAP!
+
+#### Authors
+
+- Ben Boeckel (1)
+- Ebben Aries (1)
+- Ilias Tsitsimpis (1)
+
+#### Features
+
+- Introduce a code of conduct.
+- Add github templates.
+- Change hard coding of AF_UNSPEC to user-defined address-families per repository. [Ebben Aries]
+- Add documentation for the ipv6 configuration option.
+
+#### Fixes
+
+- Identify and fix messages with FMD5 inconsistencies. [Ilias Tsitsimpis]
+- Curses, UIBase: remove references to __bigversion__. [Ben Boeckel]
+- Sphinx doc: remove usage of __bigversion__.
+- MANIFEST: exclude rfcs (used for Pypi packages).
+- Changelog: fix typo.
+
+#### Changes
+
+- release.sh: move the authors section up.
+- release.sh: add pypi instructions.
+- MAINTAINERS: update.
+
+
+
 
 ### OfflineIMAP v6.7.0-rc2 (2016-02-22)
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 45a7677..369a477 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,8 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.7.0-rc2" # Expecting "-rcN" or "" for stable releases.
+# Expecting trailing "-rcN" or "" for stable releases.
+__version__     = "6.7.0"
 __copyright__   = "Copyright 2002-2016 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "offlineimap-project@lists.alioth.debian.org"