]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://github.com/slavapestov/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Sun, 26 Dec 2010 23:46:51 +0000 (15:46 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Sun, 26 Dec 2010 23:46:51 +0000 (15:46 -0800)

Trivial merge