Merge branch 'weechat' into devel
authorRalf Ertzinger <ralf@skytale.net>
Sun, 12 May 2013 18:12:04 +0000 (20:12 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sun, 12 May 2013 18:12:04 +0000 (20:12 +0200)
commit91620df347434b75329f5e75604355f87f8151b8
treed246e21636a7a993f75d1103cfd0d1c6c688dca0
parent9bb78db68a79470e45dd6400321e3dd96ffcb20b
parent7ce3d9f2dbd8a16ad3674a6ebd6a6fd4c341d9b8
Merge branch 'weechat' into devel