From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Fri, 30 Jan 2009 17:30:07 +0000 (-0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~2198^2~23
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=6240f008032dc0b50e31674a332bd694a454b85a

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

6240f008032dc0b50e31674a332bd694a454b85a
diff --cc basis/farkup/farkup.factor
index 5c446c6a22,ebd0bdb748..a752694764
mode 100644,100755..100755
--- a/basis/farkup/farkup.factor
+++ b/basis/farkup/farkup.factor
diff --cc basis/syndication/syndication.factor
index 13312d6cf2,76da6f049d..4cd5ef17b3
mode 100644,100755..100755
--- a/basis/syndication/syndication.factor
+++ b/basis/syndication/syndication.factor