From: Anton Gorenko <ex.rzrjck@gmail.com>
Date: Sun, 26 Sep 2010 17:24:30 +0000 (+0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~4352^2~11^2~18
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=d5a7f99bea930a7633655565331740c5492b9ede

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

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

d5a7f99bea930a7633655565331740c5492b9ede