[epiphany] [release] 3.7.1

[Xan Lopez <xan src gnome org>]

commit 1541cf5d49dfe093d2c1b318c8907c7f5f99ab9f
Author: Xan Lopez <xan igalia com>
Date:   Wed Oct 24 11:24:26 2012 +0200

    [release] 3.7.1

 NEWS         |   25 +++++++++++++++++++++++++
 configure.ac |    8 ++++----
 2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 34ba578..159d2bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,29 @@
 ==============
+Epiphany 3.7.1
+==============
+
+Changes:
+
+  - *NOTE* this release removes support for traditional extensions (as
+    found in the 'epiphany-extensions' module and elsewhere). They
+    will *not* work anymore, and won't be loaded on startup. See
+    https://mail.gnome.org/archives/epiphany-list/2012-October/msg00006.html
+    for a longer explanation. (#685630)
+
+  - Adblock is now imported into the core browser, disabled by
+    default. See Preferences->Privacy to enable it (#681657)
+  - Remove JavaScript preference from the UI. Pretty much every single
+    page the average user visits needs JavaScript, so this is a
+    "Please break my web" preference in disguise. For those concerned
+    about security and/or privacy the GSetting remains
+    available. (#685393)
+  - Merge the application menu in the gear menu when not running under
+    the Shell. (#673054)
+  - Do not automatically load resources we cannot handle unless they
+    are the main resource in the page. (#683635)
+  - Many other bugfixes.
+
+==============
 Epiphany 3.6.0
 ==============
 
diff --git a/configure.ac b/configure.ac
index 259467b..2c7fa00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 m4_define([epiphany_version_major],[3])
-m4_define([epiphany_version_minor],[6])
-m4_define([epiphany_version_micro],[0])
+m4_define([epiphany_version_minor],[7])
+m4_define([epiphany_version_micro],[1])
 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])
@@ -28,10 +28,10 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
 
-EPIPHANY_API_VERSION=3.6
+EPIPHANY_API_VERSION=3.7
 
 # This should stay at the major version of the latest stable releases
-EPIPHANY_UA_VERSION=3.6
+EPIPHANY_UA_VERSION=3.7
 
 AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
 AC_SUBST([EPIPHANY_API_VERSION])