Merge commit 'origin/master' into charset

Conflicts:

	src/ui/gui/psppire-data-editor.c

diff --cc src/data/psql-reader.c
Simple merge

diff --cc src/ui/gui/psppire-data-editor.c
index 1070f5c2871caef36db153d9b48aca7667497ad3,be911ba6d69817d928264eb13effd969272d029b..9d15ceb94fe53c628b90e3f48ce15e415b0e253d
--- 1/src/ui/gui/psppire-data-editor.c
--- 2/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@@ -23,8 -23,7 +23,8 @@@
  
  #include <language/syntax-string-source.h>
  #include "psppire-data-store.h"
- #include <ui/gui/sheet/psppire-axis-impl.h>
 +#include <libpspp/i18n.h>
+ #include <ui/gui/sheet/psppire-axis.h>
  #include "helper.h"
  
  #include <gtk-contrib/gtkxpaned.h>

diff --cc src/ui/gui/psppire-data-window.c
Simple merge

diff --cc src/ui/gui/psppire-dictview.c
Simple merge

diff --cc src/ui/gui/psppire-var-sheet.c
Simple merge