Tim-Philipp Müller d895ac645f Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	docs/plugins/inspect/plugin-esdsink.xml
	docs/plugins/inspect/plugin-gconfelements.xml
	ext/pulse/pulseaudiosink.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/multifile/gstmultifilesink.c
2011-12-02 01:58:30 +00:00
..
2011-11-24 21:41:03 +01:00
2011-12-01 18:55:45 +01:00
2011-11-24 21:41:03 +01:00
2011-11-26 15:01:01 +01:00
2011-11-24 21:41:03 +01:00
2011-04-08 18:07:09 +01:00
2011-11-28 13:30:27 +00:00
2011-11-24 00:54:08 +00:00
2010-03-21 15:17:46 +01:00
2011-11-24 21:41:03 +01:00