]> gitweb.factorcode.org Git - factor.git/commitdiff
Merge branch 'master' of tizoc@tiodante.com:/git/factor
authorBruno Deferrari <utizoc@gmail.com>
Wed, 16 Jul 2008 03:34:25 +0000 (00:34 -0300)
committerBruno Deferrari <utizoc@gmail.com>
Wed, 16 Jul 2008 03:34:25 +0000 (00:34 -0300)
Conflicts:

extra/irc/client/client.factor
extra/irc/messages/messages.factor


Trivial merge