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

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

Conflicts:
	src/ui/gui/page-assistant.c
---

a7005f8bc73cb857489acd07b8a792d6cf2ecff7