From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 9 May 2013 17:39:15 +0000 (+0200)
Subject: Merge branch 'master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2bba9cb07cce1652090b1931393d5739a3a9868;p=pspp

Merge branch 'master' into import-gui

Conflicts:
	src/ui/gui/psppire-cell-renderer-button.c
---

e2bba9cb07cce1652090b1931393d5739a3a9868