From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 14 Jan 2010 23:22:02 +0000 (-0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5080^2~2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=4e6a5a772f2200bdeac2a637a2872d5980709552

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

Conflicts:
	core/sequences/sequences-docs.factor
---

4e6a5a772f2200bdeac2a637a2872d5980709552