Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Tue, 9 Aug 2016 23:03:58 +0000 (01:03 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Tue, 9 Aug 2016 23:03:58 +0000 (01:03 +0200)
1  2 
src/ui/gui/psppire-data-window.c

Simple merge