]> gitweb.factorcode.org Git - factor.git/commit
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)
commit848dd3800949d5a0a241034329ac4441bfa922eb
treeeee9d0828f51d9790e0d5a65c99b342df0de9378
parentc4db578f04dd7e75489108725121da1de1d12a91
parent22b67ed3783242f2f89bf051f650e00c97a86f39
Merge branch 'master' of tizoc@tiodante.com:/git/factor

Conflicts:

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