From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 8 Mar 2013 13:14:26 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe5ba65c269e9207308608139ea2cbb4fcb761f;p=pspp

Merge remote branch 'origin/master' into import-gui

Conflicts:
	src/ui/gui/psppire-spreadsheet-model.c
---

ffe5ba65c269e9207308608139ea2cbb4fcb761f