Merge branch 'devel' of http://10.200.0.3/GIT/videosite into devel
authorRalf Ertzinger <ralf@skytale.net>
Sun, 23 Jun 2013 17:07:02 +0000 (19:07 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sun, 23 Jun 2013 17:07:02 +0000 (19:07 +0200)

Trivial merge