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)
commit2ef5353face7a41eea1db9eba7d360e82573753c
tree0c022ca3d31d39f0fe0ee8e15892e4e342e60732
parentd158da20419ae2c682f2c0d67b7739313e26466b
parentf1fdd9a708ce0020c9387cdf2263000ca3c189b2
Merge branch 'devel' of ssh://ryoko:22003/home/sun/GIT/videosite into devel