From: Diego Barrios Romero <eldruin@gmailcom>
Date: Wed, 27 Jan 2010 17:42:50 +0000 (+0100)
Subject: Merge branch 'eldruin_ffmpeg' of ssh://synfig.git.sourceforge.net/gitroot/synfig... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=971a0a14a75d8f5b6e85a897c46cb702423aa7c8;p=synfig.git

Merge branch 'eldruin_ffmpeg' of ssh://synfig.git.sourceforge.net/gitroot/synfig/synfig
---

971a0a14a75d8f5b6e85a897c46cb702423aa7c8