From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 2 Mar 2009 22:12:26 +0000 (+0900)
Subject: Merge branch 'master'; commit 'origin/stable'
X-Git-Tag: v0.7.3~263
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp-builds.git

Merge branch 'master'; commit 'origin/stable'

Conflicts:

	src/math/linreg.h
	src/ui/gui/psppire-data-editor.c
---

8af88c0b7ea2fe75df7e45497988ed0371006a86