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)
commit4246294842a8abedecaaf55aa87507225f03f58c
treec6aee15c8010230bd6c36680d237e99765b9114f
parent4120a9b233c35c8fc6afc051cafe1c702661fe30
parentdae6cb8b61f6c4864c428e94aaaf680de510041e
Merge remote-tracking branch 'origin/master' into sheet
src/ui/gui/psppire-import-assistant.c