Merge branch 'master' of http://10.200.0.3/GIT/videosite
authorRalf Ertzinger <ralf@skytale.net>
Thu, 10 Nov 2011 08:12:16 +0000 (09:12 +0100)
committerRalf Ertzinger <ralf@skytale.net>
Thu, 10 Nov 2011 08:12:16 +0000 (09:12 +0100)

Trivial merge