From: Doug Coleman <doug.coleman@gmail.com>
Date: Fri, 14 Aug 2009 00:40:02 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5796
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=2ed4425b7a0072bcce71cf388b100d07bb1b0da2

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

Conflicts:
	basis/calendar/calendar.factor
---

2ed4425b7a0072bcce71cf388b100d07bb1b0da2