Merge branch 'devel' of ssh://ryoko:22003/home/sun/GIT/videosite into devel
authorRalf Ertzinger <ralf@skytale.net>
Tue, 28 May 2013 19:54:24 +0000 (21:54 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Tue, 28 May 2013 19:54:24 +0000 (21:54 +0200)

Trivial merge