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

Simple merge