Merge remote-tracking branch 'origin/master' into sheet

diff --cc NEWS
Simple merge

diff --cc configure.ac
index 492cdd3085efccf7e8b610ca0b68c5f0d9dac4f8,fc8761ad9076c3e5b34c612d3e3fff6a30590615..6e7984bf988889a7ad6f495cc5009d37df95ec54
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,7 -18,7 +18,7 @@@ dnl Process this file with autoconf to 
  
  dnl Initialize.
  AC_PREREQ(2.63)
- AC_INIT([GNU PSPP], [0.10.5pre1], [bug-gnu-pspp@gnu.org], [pspp])
 -AC_INIT([GNU PSPP], [0.10.5-pre3], [bug-gnu-pspp@gnu.org], [pspp])
++AC_INIT([GNU PSPP], [0.10.4], [bug-gnu-pspp@gnu.org], [pspp])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_TESTDIR([tests])

diff --cc lib/automake.mk
Simple merge

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/text-data-import.ui
Simple merge

diff --cc src/ui/gui/widgets.c
Simple merge