From 2f76f544436e7f77a15a7aa4af255a79a4c20e10 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 8 Mar 2013 14:45:26 +0100
Subject: [PATCH] MAINTAINERS: update for 1.2

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

Conflicts:

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

diff --git a/MAINTAINERS b/MAINTAINERS
index aa1b5ed6f0..428b2041ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -400,8 +400,9 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
-0.11                                    Michael Niedermayer
-0.10                                    Michael Niedermayer
+1.2                                     Michael Niedermayer
+1.1                                     Michael Niedermayer
+1.0                                     Michael Niedermayer