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)
commitd81edc573e35cb5502f2b5e52323b980600c0c8b
tree20b0103d74f99da7f6f891894d11b9ff324c6b72
parentef0c8d5f9fe9c11c4b6e5aafdc7c1139771f6385
parent67d0c25eab1c425d22549a5d3437380a7740aec1
Merge 'jaimeMF/videoconversion' (sans actual option for now)