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)
commitf062823782af5f98fecb1808136df3d565194698
treeb724d18f03ad3163abafa6d8901b5c693bd81bc7
parentd3fd659f663602b5564e4c750c0bebe48ff72865
parentcaea04e274261b575c7a3c5d3742c2a9672a5c54
Merge remote-tracking branch 'origin/master' into sheet

Conflicts:
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-data-window.c