From: Anton Gorenko <ex.rzrjck@gmail.com>
Date: Sat, 17 Jul 2010 08:11:06 +0000 (+0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~4241^2~1^2~14
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=65362a67e8ba54ceb60db72f4d2532bdf80a6e5d

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

Conflicts:
	basis/pango/cairo/cairo.factor
---

65362a67e8ba54ceb60db72f4d2532bdf80a6e5d