From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 18 Jul 2009 11:20:38 +0000 (+0200)
Subject: Merge commit 'origin/data-encoding'
X-Git-Tag: build37~53
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f04b0ced35a66cfdebefbcb53c81979add36ca3;hp=8f04b0ced35a66cfdebefbcb53c81979add36ca3;p=pspp-builds.git

Merge commit 'origin/data-encoding'

Conflicts:

	src/language/dictionary/split-file.c
---