]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge remote branch 'erikc/master'
authorJoe Groff <arcata@gmail.com>
Mon, 13 Jun 2011 18:28:02 +0000 (11:28 -0700)
committerJoe Groff <arcata@gmail.com>
Mon, 13 Jun 2011 18:28:02 +0000 (11:28 -0700)

Trivial merge