Merge branch 'weechat' of http://10.200.0.3/GIT/videosite into weechat
authorRalf Ertzinger <ralf@skytale.net>
Tue, 7 May 2013 14:06:44 +0000 (16:06 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Tue, 7 May 2013 14:06:44 +0000 (16:06 +0200)

Trivial merge