Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Aug 2016 05:51:36 +0000 (07:51 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 14 Aug 2016 05:51:36 +0000 (07:51 +0200)
Conflicts:
src/ui/gui/psppire-data-window.c

1  2 
src/ui/gui/psppire-data-window.c

Simple merge