From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 18 Dec 2008 03:07:42 +0000 (-0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~2207^2~27
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=4dd615fa9ee15d5357202a60e102802b0377ead3

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

Conflicts:
	basis/db/types/types.factor
---

4dd615fa9ee15d5357202a60e102802b0377ead3