From: Joe Groff <arcata@gmail.com>
Date: Mon, 11 May 2009 17:37:50 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~6298
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=b070edc7510f241c5b06129b22ee288c0339d032

Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/ui/gadgets/worlds/worlds.factor
---

b070edc7510f241c5b06129b22ee288c0339d032