From: Bruno Deferrari Date: Mon, 15 Sep 2008 18:28:16 +0000 (-0300) Subject: Merge branch 'master' of git://factorcode.org/git/factor X-Git-Tag: 0.94~2334^2~2^2~17 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=4bd73a1eb7a96e6f54f091e9cf4e217de004308b Merge branch 'master' of git://factorcode.org/git/factor Conflicts: extra/irc/messages/messages.factor --- 4bd73a1eb7a96e6f54f091e9cf4e217de004308b