Tim-Philipp Müller 32b14c6ed3 Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/vorbis/gstvorbisenc.c
	gst/playback/gstdecodebin2.c
	gst/playback/gstplaysinkconvertbin.c
	gst/videorate/gstvideorate.c
2011-11-26 12:12:59 +00:00
..
2011-11-11 11:52:47 +01:00
2011-11-18 17:58:58 +01:00
2011-11-17 12:48:25 +01:00
2011-11-17 12:48:25 +01:00
2011-06-15 00:52:47 +01:00