Wim Taymans e44dd9db8f Merge branch 'master' into 0.11
Conflicts:
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/pbutils/gstdiscoverer.c
2012-02-16 14:23:28 +01:00
..
2011-05-23 15:02:27 +03:00
2012-01-25 12:30:53 +01:00
2012-01-25 12:30:53 +01:00
2012-01-25 12:30:53 +01:00
2012-02-03 11:38:15 +01:00
2012-02-16 14:23:28 +01:00
2012-02-13 16:03:03 +00:00
2012-02-10 15:41:06 +01:00