Merge branch '512_bump_video_js'
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 25 Dec 2012 18:18:23 +0000 (19:18 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 25 Dec 2012 18:18:23 +0000 (19:18 +0100)

Trivial merge