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

author Doug Coleman <doug.coleman@gmail.com>

Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)

committer Doug Coleman <doug.coleman@gmail.com>

Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)
author Doug Coleman <doug.coleman@gmail.com>
Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)
committer Doug Coleman <doug.coleman@gmail.com>
Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)
diff --cc basis/math/combinatorics/combinatorics.factor
Simple merge
author	Doug Coleman <doug.coleman@gmail.com>
	Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)
committer	Doug Coleman <doug.coleman@gmail.com>
	Sun, 6 Dec 2009 08:28:46 +0000 (02:28 -0600)