[SCM] lives/master: Refresh 02-* patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 268dd1315b425028d651791ae6089fd62ec3af52
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 26 09:30:09 2012 +0200

    Refresh 02-* patch.

diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index 5b4de3f..af49547 100644
--- a/debian/patches/02-drop_py3_multiencoder.patch
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
  transcode_encoder \
 --- lives.orig/lives-plugins/plugins/encoders/Makefile.in
 +++ lives/lives-plugins/plugins/encoders/Makefile.in
-@@ -344,7 +344,6 @@ ffmpeg_encoder \
+@@ -355,7 +355,6 @@ ffmpeg_encoder \
  mencoder_encoder \
  mjpegtools_encoder \
  multi_encoder \

-- 
lives packaging