]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of git://github.com/slavapestov/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Sat, 29 Jan 2011 15:33:17 +0000 (07:33 -0800)
committerJohn Benediktsson <mrjbq7@gmail.com>
Sat, 29 Jan 2011 15:33:17 +0000 (07:33 -0800)

Trivial merge