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)

Trivial merge