gitweb.factorcode.org Git - factor.git/commit

author	Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
	Wed, 9 Jul 2008 04:05:25 +0000 (23:05 -0500)
committer	Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
	Wed, 9 Jul 2008 04:05:25 +0000 (23:05 -0500)
commit	515dfd3ef2fa2509d2f8b95f0f47eff935bf74c6
tree	39b6a1e768fa42e04f4df00ed23de650679e2fcd	tree \| snapshot
parent	1a32ffafa389a9769e7d96ce1f7e599247fef280	commit \| diff
parent	7c76046d3b65654306c08a7d0d539ea3e04d5bfd	commit \| diff

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

Conflicts:

extra/bake/bake.factor