Merge remote-tracking branch 'joksnet/not_keep_video_message'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 24 Feb 2013 23:35:12 +0000 (00:35 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 24 Feb 2013 23:35:12 +0000 (00:35 +0100)

Trivial merge