From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 14 Aug 2016 05:51:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into sheet
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f062823782af5f98fecb1808136df3d565194698;p=pspp

Merge remote-tracking branch 'origin/master' into sheet

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

f062823782af5f98fecb1808136df3d565194698