[epiphany/wip/ephy-sync: 21/126] Prepare 3.21.4

[Gabriel - Cristian Ivascu <gabrielivascu src gnome org>]

commit f37ca67b8c41e7d401df26fb6b79a1801ada2e9d
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Sun Jul 17 14:02:20 2016 +0300

    Prepare 3.21.4

 NEWS         |   12 ++++++++++++
 configure.ac |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index b912ae5..a0158f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,16 @@
 ===============
+Epiphany 3.21.4
+===============
+
+- Check for NULL SoupURI when trying to load invalid url(#768250)
+- Fix misleading ChangeLog generation code(#768218)
+- Limit side of ChangeLog file(#768218)
+- Add keyboard shortcuts dialog(#757830)
+- Update POTFILES.in(#757830)
+- Generate ChangeLog in builddir(#768218)
+- Updated translations
+
+===============
 Epiphany 3.21.3
 ===============
 
diff --git a/configure.ac b/configure.ac
index f96208b..1b2c67b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 m4_define([epiphany_version_major],[3])
 m4_define([epiphany_version_minor],[21])
-m4_define([epiphany_version_micro],[3])
+m4_define([epiphany_version_micro],[4])
 m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
 
 AC_INIT([GNOME Web 
Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])