From: Matthew Willis <matthew.willis@mac.com>
Date: Fri, 6 Jun 2008 19:17:22 +0000 (-0700)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~3164
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=1f6530b16efe52f4ab3da8449c58a1fc89b176b4

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

Conflicts:

	extra/pango/cairo/gadgets/gadgets.factor
---

1f6530b16efe52f4ab3da8449c58a1fc89b176b4