Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 12 Aug 2016 04:43:40 +0000 (06:43 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 12 Aug 2016 04:43:40 +0000 (06:43 +0200)
1  2 
src/ui/gui/psppire-import-assistant.c

Simple merge