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)
commit55ed9957c9c46f6eaf491a821a60ef6c58b29f87
tree786e9c37a6c6328e29d004b2ad29f1cf128296f3
parent9ec44345be36b9046162b44795f4f0d45835abe1
parent2ef5353face7a41eea1db9eba7d360e82573753c
Merge branch 'devel' of 10.200.0.3/GIT/videosite into devel