]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://github.com/slavapestov/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Mon, 13 Dec 2010 20:47:10 +0000 (12:47 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Mon, 13 Dec 2010 20:47:10 +0000 (12:47 -0800)

Trivial merge