Merge 'jaimeMF/videoconversion' (sans actual option for now)
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 12 Jan 2013 13:04:30 +0000 (14:04 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 12 Jan 2013 13:04:30 +0000 (14:04 +0100)

Trivial merge