[FFmpeg-cvslog] MAINTAINERS: update for 1.2

[Michael Niedermayer]

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 14:45:26 2013 +0100| [e45f0f0f667b8f779f3ded068f773676a095bcb5] | committer: Michael Niedermayer

MAINTAINERS: update for 1.2

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 80f91a70be5f03fc95eb89d222d760eeaf91b135)

Conflicts:

	MAINTAINERS

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e45f0f0f667b8f779f3ded068f773676a095bcb5
---

 MAINTAINERS |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b361543..7648edc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -408,9 +408,9 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
+1.2                                     Michael Niedermayer
+1.1                                     Michael Niedermayer
 1.0                                     Michael Niedermayer
-0.11                                    Michael Niedermayer
-0.10                                    Michael Niedermayer