--- a/NEWS	Thu Apr 11 19:06:25 2013 +0300
+++ b/NEWS	Thu Apr 11 22:38:54 2013 +0300
@@ -1,3 +1,44 @@
+v2.2.0 2013-04-11  Timo Sirainen <tss@iki.fi>
+
+	* When creating home directories, the permissions are copied from the
+	  parent directory if it has setgid-bit set. For full details, see
+	  http://wiki2.dovecot.org/SharedMailboxes/Permissions
+	* "doveadm auth" command was renamed to "doveadm auth test"
+	* IMAP: ID command now advertises server name as Dovecot by default.
+	  It was already trivial to guess this from command replies.
+	* dovecot.index.cache files can be safely accessed only by v2.1.11+.
+	  Older versions may think they're corrupted and delete them.
+	* LDA/LMTP: If saving a mail brings user from under quota to over 
+	  quota, allow it based on quota_grace setting (default: 10%
+	  above quota limit).
+	* pop3_lock_session=yes now uses a POP3-only dovecot-pop3-session.lock
+	  file instead of actually locking the mailbox (and causing
+	  IMAP/LDA/LMTP to wait for the POP3 session to close).
+	* mail_shared_explicit_inbox setting's default switched to "no".
+	* ssl_client_ca_dir setting replaced imapc_ssl_ca_dir and
+	  pop3c_ssl_ca_dir settings.
+
+	+ Implemented IMAP MOVE and BINARY extensions
+	+ Implemented IMAP CATENATE, URLAUTH and URLAUTH=BINARY extensions
+	  (by Stephan Bosch).
+	+ Implemented IMAP NOTIFY extension. Requires mailbox_list_index=yes
+	  to be enabled.
+	+ Redesigned and rewritten dsync. The new design makes the syncing
+	  faster, more reliable and more featureful. The new dsync protocol
+	  isn't backwards compatible with old dsync versions (but is designed
+	  to be forwards compatible with future versions).
+	+ All mailbox formats now support per-user message flags for shared
+	  mailboxes by using a private index. It can be enabled by adding
+	  :INDEXPVT=<path> to mail location. This should be used instead of
+	  :INDEX also for Maildir/mbox to improve performance.
+	+ Improved mailbox list indexes. They should be usable now, although
+	  still disabled by default.
+	+ Added LAYOUT=index. The mailbox directories are created using their
+	  GUIDs in the filesystem, while the actual GUID <-> name mapping
+	  exists only in the index.
+	+ LMTP proxy: Implemented XCLIENT extension for passing remote IP
+	  address through proxy.
+
 v2.2.rc7 2013-04-10  Timo Sirainen <tss@iki.fi>
 
 	* checkpasword: AUTH_PASSWORD environment is no longer set.
@@ -50,44 +91,7 @@
 
 v2.2.rc1 2013-02-15  Timo Sirainen <tss@iki.fi>
 
-	* When creating home directories, the permissions are copied from the
-	  parent directory if it has setgid-bit set. For full details, see
-	  http://wiki2.dovecot.org/SharedMailboxes/Permissions
-	* "doveadm auth" command was renamed to "doveadm auth test"
-	* IMAP: ID command now advertises server name as Dovecot by default.
-	  It was already trivial to guess this from command replies.
-	* dovecot.index.cache files can be safely accessed only by v2.1.11+.
-	  Older versions may think they're corrupted and delete them.
-	* LDA/LMTP: If saving a mail brings user from under quota to over 
-	  quota, allow it based on quota_grace setting (default: 10%
-	  above quota limit).
-	* pop3_lock_session=yes now uses a POP3-only dovecot-pop3-session.lock
-	  file instead of actually locking the mailbox (and causing
-	  IMAP/LDA/LMTP to wait for the POP3 session to close).
-	* mail_shared_explicit_inbox setting's default switched to "no".
-	* ssl_client_ca_dir setting replaced imapc_ssl_ca_dir and
-	  pop3c_ssl_ca_dir settings.
-
-	+ Implemented IMAP MOVE and BINARY extensions
-	+ Implemented IMAP CATENATE, URLAUTH and URLAUTH=BINARY extensions
-	  (by Stephan Bosch).
-	+ Implemented IMAP NOTIFY extension. Requires mailbox_list_index=yes
-	  to be enabled.
-	+ Redesigned and rewritten dsync. The new design makes the syncing
-	  faster, more reliable and more featureful. The new dsync protocol
-	  isn't backwards compatible with old dsync versions (but is designed
-	  to be forwards compatible with future versions).
-	+ All mailbox formats now support per-user message flags for shared
-	  mailboxes by using a private index. It can be enabled by adding
-	  :INDEXPVT=<path> to mail location. This should be used instead of
-	  :INDEX also for Maildir/mbox to improve performance.
-	+ Improved mailbox list indexes. They should be usable now, although
-	  still disabled by default.
-	+ Added LAYOUT=index. The mailbox directories are created using their
-	  GUIDs in the filesystem, while the actual GUID <-> name mapping
-	  exists only in the index.
-	+ LMTP proxy: Implemented XCLIENT extension for passing remote IP
-	  address through proxy.
+	* See v2.2.0 notes
 
 v2.1.13 2013-01-06  Timo Sirainen <tss@iki.fi>
 

--- a/configure.ac	Thu Apr 11 19:06:25 2013 +0300
+++ b/configure.ac	Thu Apr 11 22:38:54 2013 +0300
@@ -2,7 +2,7 @@
 
 # Be sure to update ABI version also if anything changes that might require
 # recompiling plugins. Most importantly that means if any structs are changed.
-AC_INIT([Dovecot],[2.2.rc7],[dovecot@dovecot.org])
+AC_INIT([Dovecot],[2.2.0],[dovecot@dovecot.org])
 AC_DEFINE_UNQUOTED([DOVECOT_ABI_VERSION], "2.2.ABIv0($PACKAGE_VERSION)", [Dovecot ABI version])
 
 AC_CONFIG_SRCDIR([src])

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/example-config/conf.d/11-object-storage.conf	Thu Apr 11 22:38:54 2013 +0300
@@ -0,0 +1,4 @@
+# Dovecot supports storing emails into various Object Storage Systems,
+# such as Amazon S3, Windows Azure, Dropbox and others.
+# See installation instructions and example configuration at
+# http://dl.dovecot.fi/obox/obox-example-config.txt