[empathy/gnome-3-6] prepare 3.6.4

[Guillaume Desmottes <gdesmott src gnome org>]

commit 353d3b4e16c3b7b00baa4b7d95f2d580bdb5ba77
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Feb 28 13:54:06 2013 +0100

    prepare 3.6.4

 NEWS         |    7 +++++++
 configure.ac |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index b0746af..64a7578 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+NEW in 3.6.4 (28/02/2013)
+============
+
+Bugs fixed:
+ - Fixed #678983, Favorite rooms are not saved (Guillaume Desmottes)
+ - Fixed #693190, re-enable empathy-tls-test (Stef Walter)
+
 NEW in 3.6.3 (09/01/2013)
 ============
 
diff --git a/configure.ac b/configure.ac
index 373bb7a..e5a9499 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [6])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_micro_version], [4])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'