Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 007540cc361fe70b849fff449c306d116914e6b4..8d036c03faeb8a7ab7c19fda575bd42b25185c9e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -545,10 +545,10 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
+2.6                                     Michael Niedermayer
 2.5                                     Michael Niedermayer
 2.4                                     Michael Niedermayer
 2.2                                     Michael Niedermayer
-1.2                                     Michael Niedermayer
 
 If you want to maintain an older release, please contact us