Merge tag 'upstream/1.2.0'

Upstream version 1.2.0

Conflicts:
	ChangeLog
	NEWS
	RELEASE
	configure
	configure.ac
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-a52dec.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrnb.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-amrwbdec.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-asf.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-cdio.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdlpcmdec.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdsub.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-lame.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-mad.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-mpeg2dec.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-realmedia.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-siddec.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-twolame.html
	docs/plugins/html/gst-plugins-ugly-plugins-plugin-x264.html
	docs/plugins/html/index.html
	docs/plugins/inspect/plugin-a52dec.xml
	docs/plugins/inspect/plugin-amrnb.xml
	docs/plugins/inspect/plugin-amrwbdec.xml
	docs/plugins/inspect/plugin-asf.xml
	docs/plugins/inspect/plugin-cdio.xml
	docs/plugins/inspect/plugin-dvdlpcmdec.xml
	docs/plugins/inspect/plugin-dvdread.xml
	docs/plugins/inspect/plugin-dvdsub.xml
	docs/plugins/inspect/plugin-lame.xml
	docs/plugins/inspect/plugin-mad.xml
	docs/plugins/inspect/plugin-mpeg2dec.xml
	docs/plugins/inspect/plugin-realmedia.xml
	docs/plugins/inspect/plugin-siddec.xml
	docs/plugins/inspect/plugin-twolame.xml
	docs/plugins/inspect/plugin-x264.xml
	docs/plugins/inspect/plugin-xingmux.xml
	gst-plugins-ugly.doap
	gst-plugins-ugly.spec
	po/af.gmo
	po/af.po
	po/az.gmo
	po/az.po
	po/bg.gmo
	po/bg.po
	po/ca.gmo
	po/ca.po
	po/cs.gmo
	po/cs.po
	po/da.gmo
	po/da.po
	po/de.gmo
	po/de.po
	po/el.gmo
	po/el.po
	po/en_GB.gmo
	po/en_GB.po
	po/eo.gmo
	po/eo.po
	po/es.gmo
	po/es.po
	po/eu.gmo
	po/eu.po
	po/fi.gmo
	po/fi.po
	po/fr.gmo
	po/fr.po
	po/gl.gmo
	po/gl.po
	po/gst-plugins-ugly-1.0.pot
	po/hr.gmo
	po/hr.po
	po/hu.gmo
	po/hu.po
	po/id.gmo
	po/id.po
	po/it.gmo
	po/it.po
	po/ja.gmo
	po/ja.po
	po/lt.gmo
	po/lt.po
	po/lv.gmo
	po/lv.po
	po/ms.gmo
	po/ms.po
	po/mt.gmo
	po/mt.po
	po/nb.gmo
	po/nb.po
	po/nl.gmo
	po/nl.po
	po/or.gmo
	po/or.po
	po/pl.gmo
	po/pl.po
	po/pt_BR.gmo
	po/pt_BR.po
	po/ro.gmo
	po/ro.po
	po/ru.gmo
	po/ru.po
	po/sk.gmo
	po/sk.po
	po/sl.gmo
	po/sl.po
	po/sq.gmo
	po/sq.po
	po/sr.gmo
	po/sr.po
	po/sv.gmo
	po/sv.po
	po/tr.gmo
	po/tr.po
	po/uk.gmo
	po/uk.po
	po/vi.gmo
	po/vi.po
	po/zh_CN.gmo
	po/zh_CN.po
	win32/common/config.h

1 files changed, 1 insertions, 1 deletions

diff --git a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
index f88856a..4830792 100644
--- a/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
+++ b/docs/plugins/html/gst-plugins-ugly-plugins-plugin-dvdread.html
@@ -42,7 +42,7 @@
 </tr>
 <tr>
 <td><p><span class="term">version</span></p></td>
-<td>1.1.90</td>
+<td>1.2.0</td>
 </tr>
 <tr>
 <td><p><span class="term">run-time license</span></p></td>