Merge branch 'master' of tau.jukie.net:/site/scm/git/wmiirc-lua
commit773425dad877a5b5ef1e3d6dc9b1303712e40d31
authorBart Trojanowski <bart@jukie.net>
Tue, 18 Sep 2007 04:33:20 +0000 (18 00:33 -0400)
committerBart Trojanowski <bart@jukie.net>
Tue, 18 Sep 2007 04:33:20 +0000 (18 00:33 -0400)
tree8fb8e57fc54eed11687981548b727e2893663c3f
parent621b80e23d6682f5a9e16fac9e3d3147434b34ec
parent488070c88fff9883f2f8eb559d1dc93abb72509b
Merge branch 'master' of tau.jukie.net:/site/scm/git/wmiirc-lua

Conflicts:

core/wmii.lua
core/wmii.lua