]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://github.com/slavapestov/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Sun, 30 Jan 2011 04:52:47 +0000 (20:52 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Sun, 30 Jan 2011 04:52:47 +0000 (20:52 -0800)

Trivial merge