From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 16 Nov 2013 18:26:19 +0000 (-0800)
Subject: Merge 'master' into 'gtk3'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20140304033027%2Fpspp;p=pspp

Merge 'master' into 'gtk3'.
---

f2d4cc6e7a4d5948a2c0cf70883347000a79a2b0