[glom] 1.25.4

[Murray Cumming <murrayc src gnome org>]

commit 2771e4d8531d437915854947e728d33785d2933e
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Nov 19 13:57:04 2013 +0100

    1.25.4

 NEWS         |   13 +++++++++++++
 configure.ac |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index dc2baa6..a2b715c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+1.25.4 (unstable):
+
+* Fix a crash when switching between Data and Find mode.
+  (Murray Cumming)
+* Fix some widget expansion in the UI.
+  (Murray Cumming)
+* Formatting: Do not allow a 0 line-height for multiline text.
+  (Murray Cumming)
+* Added some more tests.
+  (Murray Cumming
+* Some code cleanup.
+  (Murray Cumming)
+
 1.25.3 (unstable):
 
 * Make menu item accelerators work again.
diff --git a/configure.ac b/configure.ac
index c9f2772..8b4ec72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom],[1.25.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.25.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])