[corsix-th] 01/01: Merge remote-tracking branch 'origin/jessie-ffmpeg'

[Phil Morrell]

This is an automated email from the git hooks/post-receive script.

emorrp1-guest pushed a commit to branch master
in repository corsix-th.

commit def6b77afa3d4f8580c22cc883cef0fa15bb1447
Merge: afb4b20 19b28d8
Author: Phil Morrell <debian at emorrp1.name>
Date:   Sun Feb 21 21:14:58 2016 +0000

    Merge remote-tracking branch 'origin/jessie-ffmpeg'

 debian/control | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git