]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://github.com/slavapestov/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 1 Dec 2010 16:38:05 +0000 (08:38 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 1 Dec 2010 16:38:05 +0000 (08:38 -0800)

Trivial merge